64 files changed, 79992 insertions, 75253 deletions

diff --git a/po/af.po b/po/af.po
index 9be23703..6c3d90cb 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -36,1799 +36,1831 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s word installeer\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr ""
+msgid "Is this OK?"
+msgstr "Is dit aanvaarbaar?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
+#: ../_irpm:36 ../urpm/msg.pm:41
+#, c-format
+msgid "Cancel"
+msgstr "Kanselleer"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Alles is alreeds installeer"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - druk hierdie help boodskap.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is u keuse (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+
+#: ../urpm.pm:249
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Package installation..."
-msgstr "Installasievoorbereiding..."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Installasie het misluk"
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Jammer, swak keuse, probeer weer\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Choose location to save file"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die volgende pakket bevat %s: %s\n"
+#: ../urpm.pm:352 ../urpm.pm:355
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Installasie het misluk"
+msgid "unable to write config file [%s]"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Slegs een van die volgende pakkette word benodig:"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
-"d MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpm.pm:423
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:441
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "geen pakket het die naam %s nie\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:452
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "unknown package"
+msgid "skipping package %s"
 msgstr "geen pakket het die naam %s nie\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Installasie het misluk"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "Die volgende pakket bevat %s: %s\n"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
-"d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - woordryke modus.\n"
+msgid "virtual medium need to be local"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "Aanvangstadium...."
+msgid "added medium %s"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "Installasie het misluk"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Druk ENTER wanneer u reg is..."
-
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "Installasie het misluk"
+
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpm.pm:1398
+#, c-format
+msgid "md5sum mismatch"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1579
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:1679
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "installing %s\n"
-msgstr "%s word installeer\n"
+msgid "found %d headers in cache"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1749
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to promote %s"
-msgstr "probeer promosie van %s"
+#: ../urpm.pm:1893
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "%s word installeer\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+msgid "unmounting %s"
+msgstr "%s word installeer\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1929
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "Missing signature (%s)"
+msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2076
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "geen pakket het die naam %s nie\n"
+
+#: ../urpm.pm:2079 ../urpme:88
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "malformed input: [%s]"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "RPM-databasisnavraag het misluk\n"
+
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "removing package %s will break your system"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2561
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installeer tans pakket %s (%s/%s)...."
+#: ../urpm.pm:2574
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "do you agree ?"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving done"
-msgstr ""
+#: ../urpm.pm:2794
+#, fuzzy, c-format
+msgid "removing package %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:2806
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "geen pakket het die naam %s nie\n"
+msgid "unable to install package %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr ""
+msgid "due to missing %s"
+msgstr "deur %s wat soek is"
 
-#: ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid "due to unsatisfied %s"
+msgstr "deur problematiese %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
+msgid "trying to promote %s"
+msgstr "probeer promosie van %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "in order to keep %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpm.pm:3035
+#, fuzzy, c-format
+msgid "in order to install %s"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpm.pm:3065
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "due to conflicts with %s"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
+msgid "Sorry, bad choice, try again\n"
+msgstr "Jammer, swak keuse, probeer weer\n"
 
-#: ../urpm.pm:1
+#: ../urpme:36
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "Preparing..."
-msgstr ""
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "Installasie het misluk"
-
-#: ../urpmq:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpme:50
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "geen pakket het die naam %s nie\n"
+
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "geen pakket het die naam %s nie\n"
+
+#: ../urpme:93
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpme:95
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
+"d MB)"
+
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+
+#: ../urpme:115
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:27
 #, c-format
 msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "...copying done"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "error registering local packages"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Die volgende pakket bevat %s: %s\n"
-
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:47
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:49
 #, c-format
-msgid "Save file"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:55
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Slegs een van die volgende pakkette word benodig:"
-
-#: ../urpm.pm:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "unrequested"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:61
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:62
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:64
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:65
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:72
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:82
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "%s word installeer\n"
-
-#: ../urpmi.update:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "restarting urpmi"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "Installasie het misluk"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:95
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:96
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "geen pakket het die naam %s nie\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "selecting multiple media: %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:109
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - druk hierdie help boodskap.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:119
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:120
 #, 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"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:125
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid "Is this OK?"
-msgstr "Is dit aanvaarbaar?"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "Nothing to remove"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr "Moet niks doen nie"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "Save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "Copying failed"
+msgid "Install it"
 msgstr "Installasie het misluk"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:239
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr ""
-
-#: ../urpmq:1
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
+#: ../urpmi:243 ../urpmi:365
+#, fuzzy, c-format
+msgid "Copying failed"
+msgstr "Installasie het misluk"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s word installeer\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr ""
+msgid "One of the following packages is needed:"
+msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is u keuse (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+msgid "Package installation..."
+msgstr "Installasievoorbereiding..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr ""
+msgid "Initializing..."
+msgstr "Aanvangstadium...."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "removing medium \"%s\""
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Kanselleer"
+#: ../urpmi:461
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "Die volgende pakket bevat %s: %s\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
+"d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Sit asb. die %s getiteld %s in"
+
+#: ../urpmi:541
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Druk ENTER wanneer u reg is..."
+
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:619
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Die volgende pakket bevat %s: %s\n"
+
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "Installasie het misluk"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+#: ../urpmi:665
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s word installeer\n"
 
-#: ../urpmf:1
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "%s word installeer\n"
+
+#: ../urpmi:688
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
+
+#: ../urpmi:772
+#, fuzzy, c-format
+msgid "%d installation transactions failed"
+msgstr "Installasie het misluk"
+
+#: ../urpmi:780
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "Installasie het misluk"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "copying hdlists file..."
-msgstr ""
+msgid "Everything already installed"
+msgstr "Alles is alreeds installeer"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "Do nothing"
-msgstr "Moet niks doen nie"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "%s word installeer\n"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "unable to create transaction"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s word installeer\n"
-
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Installasie het misluk"
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Sit asb. die %s getiteld %s in"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:38
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:53
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:54
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:58
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "deur problematiese %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "urpmi database locked"
-msgstr "RPM-databasisnavraag het misluk\n"
+#: ../urpmq:75
+#, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "deur %s wat soek is"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Slegs een van die volgende pakkette word benodig:"
+
+#, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "Installasie het misluk"
 
diff --git a/po/ar.po b/po/ar.po
index 65b67a17..1c061ac8 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-09 12:39+0200\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -34,852 +35,771 @@ msgstr "نyY"
 msgid "Nn"
 msgstr "لاNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "جاري تثبيت %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - أنشئ كلّ الوسطاء تلقائيّاً من\n"
-"                   وسيط التّثبيت\n"
+"التثبيت الآلي للحزم...\n"
+"لقد طلبت تثبيت الحزمة %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "تعذر فتح rpmdb"
+msgid "Is this OK?"
+msgstr "هل أنت موافق؟"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
+msgid "Ok"
+msgstr "موافق"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
+msgid "Cancel"
+msgstr "إلغاء"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "جاري حذف الحزمة %s"
+msgid " (Y/n) "
+msgstr " (ن/ل)"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: لم يتم يعثر على الأمر\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "لا يمكن استخدام وضع التوازي parallel مع وضع استخدم-التوزيع"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"الاستعمال: %s [الخيارات]\n"
+"حيث [الخيارات] مأخوذة من\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "كل شئ مثبت مسبقا"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - تطبع رسالة المساعدة هذه.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - حدّد النّتائج إلى مجموعة معيّنة.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "جاري استخدام العمليّة %d لتنفيذ المعاملة"
+msgid "                    defaults is %s.\n"
+msgstr "                    الافتراضات هي %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
+msgid "unknown protocol defined for %s"
+msgstr "بروتكول غير معرّف لـ%s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ما هو اختيارك؟ (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "لم يعثر على أي وسيلة تنزيل، وسائل التنزيل المدعومة هي: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "عُثر على %d ترويسة في الذاكرة المخبّئة"
+msgid "unable to handle protocol: %s"
+msgstr "تعذر التعامل مع البروتوكول: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "هناك حزم متعددة بنفس اسم ملف rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "خطأ تركيبي في ملف التهيئة عند السطر %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - حدّد اسم المستخدم وكلمة السرّ لاستخدامهما للتّوثيق مع "
-"البروكسي\n"
-"                   (بتنسيق <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "الوسيط \"%s\" يحاول اسنخدام ملف hdlist مستخدم مسبقا، تم تجاهل الوسيط"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "جاري القيام بالمرحلة الثانية لحساب المُعتمدات\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا، تم تجاهل الوسيط"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "جاري استرجاع ملف rpm [%s]..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"لم يمكن الاعتناء بالوسيط \"%s\" حيث أن ملف القوائم قيد الاستخدام من قبل وسيط "
+"آخر"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - إصنع قائمة للأسماء المستعارة الموازية.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...فشل الإسترجاع: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "لم يمكن أخذ الوسيط \"%s\" في الحسبان لأنه لا يوجد ملف القوائم [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "لم يمكن التفتيش عن ملف قائمة \"%s\"، تم تجاهل الوسيط"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "لم يمكن التعرف على الوسيط الخاص بملف hdlist هذا [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - معامل OR الثّنائي، true إن كان أحد العبارتين الجبريّتين "
-"صحيح.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\"، تم تجاهل الوسيط"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "تثبيت الحزم..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "لم يمكن الوصول الى ملف قائمة \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "اسم ملف rpm غير موجود [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "جاري محاولة تخطّي الوسيط الموجود \"%s\"، جري التجاهل"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"الوسيط الافتراضي \"%s\" يحاول اسنخدام ملف hdlist أو ملف قوائم مستخدم مسبقا، "
+"تم تجاهل الوسيط"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "فشل معاملات تثبيت %d"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "الوسيط الافتراضي\"%s\" يجب أن يكون له عنوان واضح، تم تجاهل الوسيط"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "لم يمكن الوصول الى وسيط التثبيت الأول (ملف Mandrake/base/hdlists غير موجود)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "لم يمكن ايجاد ملف hdlist لـ \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "لم يمكن ايحاد ملف القوائم لـ\"%s\"، تم تجاهل الوسيط"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "اختر مكان حفظ الملف"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ملف القوائم لـ\"%s\" متفكّك، تمّ تجاهل الوسيط"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - اطبع تلخيص الصّفة : التلخيص.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "لم يمكن التفتيش عن ملف قائمة \"%s\"، تم تجاهل الوسيط"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "الحزم التالية تحتوي على %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "قم بتثبيتها"
+msgid "taking removable device as \"%s\""
+msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - استخدم واجهة X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "أحد الحزم التالية يُحتاج اليه:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "لإرضاء الاعتمادات، ستتم ازالة الحزم التالية (%d ميغابايت)"
+msgid "unable to write config file [%s]"
+msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - اختر الواجهة الأفضل بناءً على البيئة:\n"
-"                   وَضْع X أو النّصّي.\n"
+msgid "write config file [%s]"
+msgstr "اكتب ملف التهيئة [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "جاري تنزيل الحزمة `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "لا يمكن استخدام وضع التوازي parallel مع وضع استخدم-التوزيع"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "تعذر تحليل \"%s\" في الملف [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "جاري اختبار المتعامل المتوازي في الملف [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "لا توجد حزمة بالإسم %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"لقد فشل التثبيت، بعض الملفات غير موجودة:\n"
-"%s\n"
-"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
+msgid "unable to use parallel option \"%s\""
+msgstr "تعذر استخدام الخيار المتوازي \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"الاستخدام: urpmi.removemedia [-a] <name> ...\n"
-"حيث أن <name> هو اسم الوسيط المطلوب ازالته.\n"
+"--synthesis لا يمكن استخدامه مع --media، --excludemedia، --sortmedia، --"
+"update أو --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
-"لكي تتم ترقية الحزم الأخرى:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "جاري اختبار ملف التخليق [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' مفقودة لوسط الشّبكة\n"
+msgid "examining hdlist file [%s]"
+msgstr "جاري اختبار ملف hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "الوسيط الافتراضي \"%s\" غير محلي، تم تجاهل الوسيط"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "حزمة غير معروفة"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "مشكلة في قراءة ملف التخليق أو hdlist للوسيط \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "التثبيت ممكن"
+msgid "performing second pass to compute dependencies\n"
+msgstr "جاري القيام بالمرحلة الثانية لحساب المُعتمدات\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "جاري تخطي الحزمة %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية (%d ميغابايت)"
+msgid "would install instead of upgrade package %s"
+msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "لم يمكن أخذ الوسيط \"%s\" في الحسبان لأنه لا يوجد ملف القوائم [%s]"
+msgid "unable to open rpmdb"
+msgstr "تعذر فتح rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (ن/ل)"
+msgid "medium \"%s\" already exists"
+msgstr "الوسيط \"%s\" موجود مسبقا"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "تعذر اضافة التحديثات لتوزيعة ccoker\n"
+msgid "virtual medium need to be local"
+msgstr "الوسيط الافتراضي يجب أن يكون محلياً"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - وضع تفصيلي.\n"
+msgid "added medium %s"
+msgstr "تمت اضافة الوسيط %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "جاري البدء..."
+msgid "unable to access first installation medium"
+msgstr "لم يمكن الوصول الى أول وسيط تخزين"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - اسرد الحزم المتوفّرة.\n"
+msgid "copying hdlists file..."
+msgstr "جاري نسخ ملف hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - اطبع كل الصّفات.\n"
+msgid "...copying failed"
+msgstr "...فشل النسخ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قابل للإزالة إلا أنه ليس كذلك"
+msgid "...copying done"
+msgstr "...تم النسخ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"الوسيط الافتراضي \"%s\" يحاول اسنخدام ملف hdlist أو ملف قوائم مستخدم مسبقا، "
-"تم تجاهل الوسيط"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "جاري حساب md5sum لـhdlist المصدر المنسوخ (أو التخليق)"
+"لم يمكن الوصول الى وسيط التثبيت الأول (ملف Mandrake/base/hdlists غير موجود)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - استثن المسارات الفصولة بفاصلة.\n"
+msgid "retrieving hdlists file..."
+msgstr "جاري استرجاع ملف hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "اضغط Enter عند الاستعداد..."
+msgid "...retrieving done"
+msgstr "...تم الاسترجاع"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"خيارات غير معروفة '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...فشل الإسترجاع: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - جزّء على شكل معاملات صغيرة إن كان هناك أكثر من عدد الحزم "
-"المحدّة                   سوف يتمّ تثبيته أو تحديثه،\n"
-"                   والمفترض هو %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "وصف hdlist غير صالح \"%s\" في ملف hdlists"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "مشكلة في قراءة ملف التخليق أو hdlist للوسيط \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - استخدم wget لجلب الملفّات البعيدة.\n"
+msgid "selecting multiple media: %s"
+msgstr "جاري اختيار الوسيط المتعدد: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - اسرد النقاط المتوفّرة عند استخدام --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "جاري بناء hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"لم يمكن الوصول للوسيط \"%s\"،\n"
+"قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - أبْق الحزم الموجودة إن أمكن، وارفض الحزم المطلوبة\n"
-"                   التي تؤدّي للإزالة.\n"
+"الوسيط الافتراضي \"%s\" يجب أن يكون مصدر تخليق أو hdlist صالح، تم تجاهل "
+"الوسيط"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "جاري اختبار ملف MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: لم يتم يعثر على الأمر\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "جاري حساب md5sum لـhdlist المصدر الموجود (أو التخليق)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "تعذر تسجيل ملف rpm"
+msgid "examining MD5SUM file"
+msgstr "جاري اختبار ملف MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
-"                   التّحقّق من المعتمدات.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "جاري نسخ hdlist (أو ملف تخليق) المصدر لـ\"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "تعذر التعامل مع البروتوكول: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "جاري استرجاع ملف hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "جاري حساب md5sum لـhdlist المصدر المنسوخ (أو التخليق)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "نعم، قم بتثبيتها"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "تمت اضافة الوسيط %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - أبق حزم rpm الغير مستخدمة في الذاكرة المخبّئة.\n"
+msgid "reading rpm files from [%s]"
+msgstr "جاري قراءة ملفات rpm من [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum غير متطابق"
+msgid "no rpm files found from [%s]"
+msgstr "لم يُعثر على ملفات rpm من [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "خطأ تركيبي في ملف التهيئة عند السطر %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
 
-#: ../urpmi:1
+# y, c-format
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - استخدم بروكسي HTTP المحدّد، رقم المنفذ الافتراضي\n"
-"                   هو 1080 (بتنسيق <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "كي يتم تثبيث %s"
+msgid "md5sum mismatch"
+msgstr "md5sum غير متطابق"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "تم اعدة %s مدخل في depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "فشل استرجاع hdlist (أو ملف تخليق) المصدر"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "جاري استرجاع المرايا عند %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "بروتكول غير معرّف لـ%s"
+msgid "nothing written in list file for \"%s\""
+msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "الوسيط \"%s\" موجود مسبقا"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "جاري تثبيت %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"المدخل المطلوب تحديثه غير موجود\n"
-"(واحد من %s)\n"
+msgid "building hdlist [%s]"
+msgstr "جاري بناء hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "جاري محاولة ترقية %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "تعذر حذف الحزمة %s"
+msgid "found %d headers in cache"
+msgstr "عُثر على %d ترويسة في الذاكرة المخبّئة"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "تم إزالة %d الترويسات الملغيّة من الذاكرة المخبّئة"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"المدخل المطلوب ازالته غير موجود\n"
-"(واحد من %s)\n"
+msgid "mounting %s"
+msgstr "جاري تجهيز %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - استخدم كل الوسائط.\n"
+msgid "unmounting %s"
+msgstr "جاري ازالة تجهيز %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "توقيع مفقود (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "تم اعدة %s مدخل في depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "تعذر قراءة ملفات rpm من [%s]: %s "
+msgid "no entries relocated in depslist"
+msgstr "لم يتم اعادة مدخلات في depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "اسم ملف rpm غير موجود [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "جاري استرجاع ملف rpm [%s]..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "لم يمكن الوصول الى ملف rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (ن/ل)"
+msgid "unable to register rpm file"
+msgstr "تعذر تسجيل ملف rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - حدّد النّتائج إلى مجموعة معيّنة.\n"
+msgid "error registering local packages"
+msgstr "خطأ في تسجيل الحزم المحلية"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا، تم تجاهل الوسيط"
+msgid "no package named %s"
+msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "ادخال مشوه: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "الحزم التالية تحتوي على %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "هناك حزم متعددة بنفس اسم ملف rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
+"الوسيط \"%s\" يستخدم ملف قوائم غير صالح   ربما تكون المرآة غير محدّثة، جاري "
+"محاولة استخدام طريقة بديلة"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "لم يتم اعادة مدخلات في depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "الوسيط \"%s\" لا يعرف أي موقع لملفات rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - ثبّت الحزمة المصدريّة فقط (لا المجمّعة).\n"
+msgid "package %s is not found."
+msgstr "لم يمكن ايجاد الحزمة %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - استخدم curl لجلب الملفّات البعيدة.\n"
+msgid "urpmi database locked"
+msgstr "تم اقفال قاعدة بيانات urpmi"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "الوسيط \"%s\" غير مختار"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "هل أنت موافق ؟"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "ملف القوائم لـ\"%s\" متفكّك، تمّ تجاهل الوسيط"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "تم تحديد الوسيط المفكّك \"%s\" على أنه قابل للإزالة إلا أنه ليس كذلك"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...تم الاسترجاع"
+msgid "unable to access medium \"%s\""
+msgstr "لم يمكن الوصول الى الوسيط \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "جاري اضافة الحزمة %s (id=%d، eid=%d، تحديث=%d، ملف=%s)"
+msgid "malformed input: [%s]"
+msgstr "ادخال مشوه: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "جاري تخطي الحزمة %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "توقيع غير صالح (%s)"
+msgid "Preparing..."
+msgstr "جاري التحضير..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
+msgid "using process %d for executing transaction"
+msgstr "جاري استخدام العمليّة %d لتنفيذ المعاملة"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi الإصدار %s\n"
-" جميع الحقوق محفوظة 1999، 2000، 2001، 2002 MandrakeSoft.\n"
-" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستخدام:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "لم يمكن التعرف على الوسيط الخاص بملف hdlist هذا [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "لم يمكن تحليل ملف hdlist لـ \"%s\""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "جاري انشاء معاملة للتثبيت على %s (حذف=%d، تثبيت=%d، ترقية=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "الوسيط \"%s\" يحاول اسنخدام ملف hdlist مستخدم مسبقا، تم تجاهل الوسيط"
+msgid "unable to create transaction"
+msgstr "تعذر انشاء المعاملة"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "بسبب التعارض مع %s"
+msgid "removing package %s"
+msgstr "جاري حذف الحزمة %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "تم إزالة %d الترويسات الملغيّة من الذاكرة المخبّئة"
+msgid "unable to remove package %s"
+msgstr "تعذر حذف الحزمة %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "جاري اضافة الحزمة %s (id=%d، eid=%d، تحديث=%d، ملف=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
+msgid "unable to install package %s"
+msgstr "تعذر تثبيث الحزمة %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "الوسيط الافتراضي \"%s\" غير محلي، تم تجاهل الوسيط"
+msgid "due to missing %s"
+msgstr "بسبب فقدان %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "جاري التحضير..."
+msgid "due to unsatisfied %s"
+msgstr "بسبب عدم ارضاء %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    الافتراضات هي %s.\n"
+msgid "trying to promote %s"
+msgstr "جاري محاولة ترقية %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
+msgid "in order to keep %s"
+msgstr "كي يتم الحفاظ على %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - لا تحاول أن تعثر على أي ملفّ تخليق\n"
-"                   أو ملف hdlist.\n"
+msgid "in order to install %s"
+msgstr "كي يتم تثبيث %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - لا تبحث في المعطيات لإيجاد جزمة.\n"
+msgid "due to conflicts with %s"
+msgstr "بسبب التعارض مع %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
+msgid "unrequested"
+msgstr "غير مطلوب"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة التوزيعة.\n"
-"                   يسمح هذا بالاستعلام من توزيعة.\n"
+msgid "Invalid signature (%s)"
+msgstr "توقيع غير صالح (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"الاستعمال: %s [الخيارات]\n"
-"حيث [الخيارات] مأخوذة من\n"
+msgid "Invalid Key ID (%s)"
+msgstr "مفتاح هوية غير صالح (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - أزل حزمة rpm من الذاكرة المخبّئة قبل أي شيء آخر.\n"
+msgid "Missing signature (%s)"
+msgstr "توقيع مفقود (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "لم يمكن استخدام الإسم \"%s\" لوسيط غير مسمى لأنه مستخدم بالفعل"
+msgid "bad proxy declaration on command line\n"
+msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"الوسيط الافتراضي \"%s\" يجب أن يكون مصدر تخليق أو hdlist صالح، تم تجاهل "
-"الوسيط"
+msgid "Sorry, bad choice, try again\n"
+msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -895,1069 +815,1206 @@ msgstr ""
 "\n"
 "الاستخدام:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"الاستخدام: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"حيث أن <url> واحد من\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"و [options] هم من\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "جاري نسخ hdlist (أو ملف تخليق) المصدر لـ\"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...تم النسخ"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi موزّع على الأجهزة الخاصّة بالاسم البديل.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "تعذر استخدام الخيار المتوازي \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"الوسيط \"%s\" يستخدم ملف قوائم غير صالح   ربما تكون المرآة غير محدّثة، جاري "
-"محاولة استخدام طريقة بديلة"
+"  --use-distrib  - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
+"                   لتثبيت/إزالة chroot باستخدام خيار --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "لم يمكن الوصول الى أول وسيط تخزين"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - وضع تفصيلي.\n"
 
-#: ../urpm.pm:1
+#
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "الوسيط الافتراضي يجب أن يكون محلياً"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "خطأ في تسجيل الحزم المحلية"
+msgid "unknown packages"
+msgstr "حزم غير معروفة"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - حدّ من سرعة التنزيل.\n"
+msgid "unknown package"
+msgstr "حزمة غير معروفة"
 
-# y, c-format
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
+msgid "removing package %s will break your system"
+msgstr "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "فشل استرجاع hdlist (أو ملف تخليق) المصدر"
+msgid "Nothing to remove"
+msgstr "لا شئ للإزالة"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "لم يُعثر على ملفات rpm من [%s]"
+msgid "Checking to remove the following packages"
+msgstr "جاري التحقق لإزالة الحزم التالية"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "لا شئ تمت كتايته في ملف القوائم لـ \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "لإرضاء الاعتمادات، ستتم ازالة الحزم التالية (%d ميغابايت)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
+msgid " (y/N) "
+msgstr " (ن/ل)"
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "جاري حساب md5sum لـhdlist المصدر الموجود (أو التخليق)"
+msgid "removing %s"
+msgstr "جاري إزالة %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - مخرجات تامّة مع الحزمة الواجب حذفها.\n"
+msgid "Removing failed"
+msgstr "فشلت عملية الإزالة"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf الإصدار %s\n"
+"جميع الحقوق محفوظة 2000، 2001، 2002 MandrakeSoft.\n"
+"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "تعذر تثبيث الحزمة %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
-"                   التّحقّق من المعتمدات والتّكامل.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "احفظ الملف"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - استخدم التخليق المحدّد بدلاً من قاعدة بيانات urpmi.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "غير قادر على كتابة ملف الإعدادات [%s]"
+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"
 
-#
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "مفتاح هوية غير صالح (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - اطبع كل الصّفات.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - اطبع تلخيص الصّفة : التلخيص.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<المسار المُرتبط لـhdlist> مفقود\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "جاري التحقق لإزالة الحزم التالية"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "غير مطلوب"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "لم يمكن الوصول الى ملف rpm [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - اطبع الصّفة ملفّات : كلّ الملفّات.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "تعذر تحليل \"%s\" في الملف [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "هل تريد متابعة التثبيت؟"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - اطبع الصّفة ملفّات : كلّ الملفّات.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "لم يمكن قراءة ملف rpm [%s] من الوسيط \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
-"                   لتثبيت chroot باستخدام الخيار --root.\n"
+"  --env          - استخدم بيئة محدّدة (عادة تقرير\n"
+"                   خطا).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - اطبع معلومات مفيدة بشكل مقروء للإنسان.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - استخدم نسخة التوزيعة المحدّدة، الخيار الافتراضي يؤخذ\n"
-"                   من نسخة التوزيعة التي تُخبِر بها\n"
-"                   حزمة إصدار ماندريك المثبّتة.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - استخدم عنوان url المحدّد للائحة المرايا، والافتراضيّة هي\n"
-"                   %s\n"
+"  -a             - معامل AND الثّنائي، true إن كانت العبارتين الجبريّتين "
+"صحيحتين.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
-"                   لتثبيت/إزالة chroot باستخدام خيار --root.\n"
+"  -o             - معامل OR الثّنائي، true إن كان أحد العبارتين الجبريّتين "
+"صحيح.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT أحاديّة، true إن كانت العبارة الجبريّة خاطئةً.\n"
 
-#: ../urpmi:1
+#
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - قوس لجهة اليسار لفتح تعبير مجموعة.\n"
+
+#
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
+"callback is :\n"
+"%s\n"
+msgstr ""
+"الاتّصال المعاكس هو:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "جاري ازالة تجهيز %s"
+msgid "using specific environment on %s\n"
+msgstr "جاري استخدام بيئة محددة على %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% اكتمل، بسرعة = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi الإصدار %s\n"
+" جميع الحقوق محفوظة 1999، 2000، 2001، 2002 MandrakeSoft.\n"
+" هذا برنامج حر ومجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "تجري إعادة تشغيل urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "جاري اختبار ملف التخليق [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - اختر الحزم آليا لترقية النظام.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...فشل النسخ"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - أبْق الحزم الموجودة إن أمكن، وارفض الحزم المطلوبة\n"
+"                   التي تؤدّي للإزالة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "لم يمكن الوصول الى ملف hdlist لـ\"%s\"، تم تجاهل الوسيط"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - جزّء على شكل معاملات صغيرة إن كان هناك أكثر من عدد الحزم "
+"المحدّة                   سوف يتمّ تثبيته أو تحديثه،\n"
+"                   والمفترض هو %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - وضع هادئ.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - small transaction length, default is %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - وضع التفصيل.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - افرض البحث التقريبي (مثل -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - أعط كل الحزم المصدريّة قبل تنزيلها (المستخدم root فقط).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - استخرج الترويسات للحزمة المسردة من قاعدة بيانات urpmi "
-"إلى\n"
-"                   stdout (المستخدم root فقط).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - ثبّت الحزمة المصدريّة فقط (لا المجمّعة).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "حزم غير معروفة"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - أزل حزمة rpm من الذاكرة المخبّئة قبل أي شيء آخر.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "جاري اختيار الوسيط المتعدد: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - أبق حزم rpm الغير مستخدمة في الذاكرة المخبّئة.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
+"                   التّحقّق من المعتمدات.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "الملف [%s] مستخدم مسبقا في الوسيط نفسه \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
+"                   التّحقّق من المعتمدات والتّكامل.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
+"                   لتثبيت chroot باستخدام الخيار --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "لم يمكن ايحاد ملف القوائم لـ\"%s\"، تم تجاهل الوسيط"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - استخدم wget لجلب الملفّات البعيدة.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - تطبع رسالة المساعدة هذه.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - استخدم curl لجلب الملفّات البعيدة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "تم ايجاد المتعامل المتوازي للعقد: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - حدّ من سرعة التنزيل.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"الاتّصال المعاكس هو:\n"
-"%s\n"
+"  --resume       - أكمل نقل الملفّات المنزّلة جزئيّاً\n"
+"                   (يقوم الخيار --no-resume بتعطيله، والوضع الافتراضي هو "
+"معطّل).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - اعكس البحث لما يتطلّب هذه الحزمة.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - استخدم بروكسي HTTP المحدّد، رقم المنفذ الافتراضي\n"
+"                   هو 1080 (بتنسيق <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf الإصدار %s\n"
-"جميع الحقوق محفوظة 2000، 2001، 2002 MandrakeSoft.\n"
-"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستخدام:\n"
+"  --proxy-user   - حدّد اسم المستخدم وكلمة السرّ لاستخدامهما للتّوثيق مع "
+"البروكسي\n"
+"                   (بتنسيق <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - لا تطبع اسم الصّفة (الوضع الافتراضي إن لم تحدد علامة على "
-"سطر الأمر،\n"
-"                   وهذا غير متوافق مع الوضع التفاعلي).\n"
+"  --bug          - أخرج تقرير خطأ في الدّليل المحدّد.                    "
+"بالكلمة التالية.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - استخدم واجهة X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis لا يمكن استخدامه مع --media، --excludemedia، --sortmedia، --"
-"update أو --parallel"
+"  --best-output  - اختر الواجهة الأفضل بناءً على البيئة:\n"
+"                   وَضْع X أو النّصّي.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - إستعمل البنية المحدّدة، الافتراض هو بنية\n"
-"                   حزمة إصدارة ماندريك (mandrake-release) المثبّتة.\n"
+"  --verify-rpm   - تأكّد من توقيع rpm قبل التّثبيت\n"
+"                   (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
+"افتراضي.)\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "هل أنت موافق؟"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - استثن المسارات الفصولة بفاصلة.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - استثْن ملفّات التوثيق.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - استخدم التخليق المحدّد بدلاً من قاعدة بيانات urpmi.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - اختر كل التطابقات على سطر الأوامر.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "جاري اختبار المتعامل المتوازي في الملف [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - السماح بالبحث في المعطيات ليجاد حزمة.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "لا شئ للإزالة"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - لا تبحث في المعطيات لإيجاد جزمة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - افرض البحث التّقريبيّ (مثل --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - وسّع الاستعلام ليشتمل المعتمدات.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - وضع هادئ.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - أخرج تقرير خطأ في الدّليل المحدّد.                    "
-"بالكلمة التالية.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر سيتم تثبيتها.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "الوسيط \"%s\" لا يعرف أي موقع لملفات rpm"
+msgid "Choose location to save file"
+msgstr "اختر مكان حفظ الملف"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "ماذا يمكن فعله مع ملف rpm تنفيذي عند استخدام المعامل --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "غير قادر على كتابة ملف القوائم لـ \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"لقد اخترت حزمة مصدريّة:\n"
+"\n"
+"%s\n"
+"\n"
+"على الأرجح أنك لا تريد تثبيتها على جهازك (تثبيتها يسمح\n"
+"لك بعمل تعديلات على الشيفرة المصدريّة ثم تجميعها).\n"
+"\n"
+"ماذا تودّ أن تفعل؟"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
+msgid "Do nothing"
+msgstr "لا تفعل شيئاً"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
+msgid "Yes, really install it"
+msgstr "نعم، قم بتثبيتها"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
+msgid "Save file"
+msgstr "احفظ الملف"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "فشل النّسخ"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"أنت على وشك تثبيت حزمة البرنامج التالية على جهازك:\n"
+"\n"
+"%s\n"
+"\n"
+"قد ترغب بحفظها فقط. ما هو اختيارك؟"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
+msgid "Install it"
+msgstr "قم بتثبيتها"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr "الدّليل [%s] موجود مسبقاً، رجاء استخدم دليلاً آخر لتقرير المشكلة أو حذفها"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "تعذر انشاء الدليل [%s] لتقرير العيوب"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s              - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
+msgid "Copying failed"
+msgstr "فشل النّسخ"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "جاري تثبيت %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "جاري قراءة ملفات rpm من [%s]"
+msgid "One of the following packages is needed:"
+msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "ما هو اختيارك؟ (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - قم باختيار حزمة آلياَ في الاختيارات.\n"
+msgid "Package installation..."
+msgstr "تثبيت الحزم..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "فشلت عملية الإزالة"
+msgid "Initializing..."
+msgstr "جاري البدء..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"   --virtual      - أنشئ وسائط خيالية محدّثة بصفة دائمة،\n"
-"                   يسمح ببروتوكول file:// فقط.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "لم يمكن ايجاد الحزمة %s"
+"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "جاري ازالة الوسيط \"%s\""
+msgid "do you agree ?"
+msgstr "هل أنت موافق ؟"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "لا داعي لإعطاء <المسار المُربتط لـhdlist> مع --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
+"لكي تتم ترقية الحزم الأخرى:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "Cancel"
-msgstr "إلغاء"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"يجب حذف الحزم التالية لترقية الحزم الأخرى:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "لإرضاء المُعتمدات، سيتم تثبيت الحزم %d التّالية (%d ميغابايت)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --env          - استخدم بيئة محدّدة (عادة تقرير\n"
-"                   خطا).\n"
+"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
+msgid "unable to get source packages, aborting"
+msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "لم يمكن الوصول الى الوسيط \"%s\""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "لم يمكن عمل الوسيط \"%s\"\n"
+msgid "Press Enter when ready..."
+msgstr "اضغط Enter عند الاستعداد..."
 
-#: ../urpmf:1
+#: ../urpmi:585
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
+msgid "Downloading package `%s'..."
+msgstr "جاري تنزيل الحزمة `%s'..."
 
-#: ../urpmq:1
+#: ../urpmi:597
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "   --dump-config  - أكتب الإعداد على شكل متغيّر لـ urpmi.addmedia.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% من %s اكتمل، الوقت المتبقّي التقريبي = %s، بسرعة = %s"
 
-#: ../urpmi:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
-"%s\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% اكتمل، بسرعة = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - اطبع سجلّ التغيير.\n"
+msgid "The following packages have bad signatures"
+msgstr "الحزم التالية تحتوي على توقيعات فاسدة"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "لم يمكن الوصول الى ملف قائمة \"%s\"، تم تجاهل الوسيط"
+msgid "Do you want to continue installation ?"
+msgstr "هل تريد متابعة التثبيت؟"
 
-#
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"لقد فشل التثبيت، بعض الملفات غير موجودة:\n"
+"%s\n"
+"ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "لم يعثر على أي وسيلة تنزيل، وسائل التنزيل المدعومة هي: %s\n"
+msgid "Installation failed"
+msgstr "فشل التثبيت"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "جاري اختبار ملف hdlist [%s]"
+msgid "distributing %s"
+msgstr "جاري توزيع %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "copying hdlists file..."
-msgstr "جاري نسخ ملف hdlist..."
+msgid "installing %s"
+msgstr "جاري تثبيت %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "الوسيط الافتراضي\"%s\" يجب أن يكون له عنوان واضح، تم تجاهل الوسيط"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
 
-#: ../urpmf:1
+#: ../urpmi:731
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "Do nothing"
-msgstr "لا تفعل شيئاً"
+msgid "%d installation transactions failed"
+msgstr "فشل معاملات تثبيت %d"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
+msgid "Installation is possible"
+msgstr "التثبيت ممكن"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "mounting %s"
-msgstr "جاري تجهيز %s"
+msgid "Everything already installed"
+msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr "تجري إعادة تشغيل urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"لم يمكن الاعتناء بالوسيط \"%s\" حيث أن ملف القوائم قيد الاستخدام من قبل وسيط "
-"آخر"
+"الاستخدام: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"حيث أن <url> واحد من\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"و [options] هم من\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - اعمل وسيط تحديث.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% من %s اكتمل، الوقت المتبقّي التقريبي = %s، بسرعة = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - لا تحاول أن تعثر على أي ملفّ تخليق\n"
+"                   أو ملف hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - أنشئ كلّ الوسطاء تلقائيّاً من\n"
+"                   وسيط التّثبيت\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - لا تسأل أبداً أن تزيل حزمةً، بل تجاهل التثبيت.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"   --distrib-XXX  - أنشئ آليا وسيطا للجزء XXX من\n"
+"                   توزيعة، يمكن لـXXX أن يكون رئيسيا (main)، مساهمة (contrib)"
+"، تحديثات (updates) أو\n"
+"                   أيّ شيئ آخر قد تمّ إعداده ؛-)\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"urpmq الإصدار %s\n"
-"جميع الحقوق محفوظة 2000، 2001، 2002 MandrakeSoft.\n"
-"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستخدام:\n"
+"  --from         - استخدم عنوان url المحدّد للائحة المرايا، والافتراضيّة هي\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - استخدم نسخة التوزيعة المحدّدة، الخيار الافتراضي يؤخذ\n"
+"                   من نسخة التوزيعة التي تُخبِر بها\n"
+"                   حزمة إصدار ماندريك المثبّتة.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - إستعمل البنية المحدّدة، الافتراض هو بنية\n"
+"                   حزمة إصدارة ماندريك (mandrake-release) المثبّتة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "الوسيط \"%s\" غير مختار"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"   --virtual      - أنشئ وسائط خيالية محدّثة بصفة دائمة،\n"
+"                   يسمح ببروتوكول file:// فقط.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "المستخدم الجذر فقط مسموح له بتثبيت الحزم"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "جاري استخدام بيئة محددة على %s\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - نظّف دليل ذاكرة الترويسات المخبّئة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "لم يمكن ايجاد ملف hdlist لـ \"%s\"، تم تجاهل الوسيط"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - small transaction length, default is %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "تعذر اضافة التحديثات لتوزيعة ccoker\n"
 
-#
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - قوس لجهة اليسار لفتح تعبير مجموعة.\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "جاري استرجاع المرايا عند %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "لا داعي لإعطاء <المسار المُربتط لـhdlist> مع --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - معامل AND الثّنائي، true إن كانت العبارتين الجبريّتين "
-"صحيحتين.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "لم يمكن تحديث الوسيط \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"لم يمكن الوصول للوسيط \"%s\"،\n"
-"قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
+msgid "<relative path of hdlist> missing\n"
+msgstr "<المسار المُرتبط لـhdlist> مفقود\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' مفقودة لوسط الشّبكة\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "لم يمكن عمل الوسيط \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
-msgstr "تعذر انشاء المعاملة"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"الاستخدام: urpmi.removemedia [-a] <name> ...\n"
+"حيث أن <name> هو اسم الوسيط المطلوب ازالته.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "جاري استرجاع ملفات rpm للوسيط \"%s\"..."
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - استخدم كل الوسائط.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
-"لقد اخترت حزمة مصدريّة:\n"
-"\n"
-"%s\n"
-"\n"
-"على الأرجح أنك لا تريد تثبيتها على جهازك (تثبيتها يسمح\n"
-"لك بعمل تعديلات على الشيفرة المصدريّة ثم تجميعها).\n"
 "\n"
-"ماذا تودّ أن تفعل؟"
+"خيارات غير معروفة '%s'\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "جاري توزيع %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "لا شء للإزالة (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "فشل التثبيت"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"المدخل المطلوب ازالته غير موجود\n"
+"(واحد من %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "اكتب ملف التهيئة [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"الاستخدام: urpmi.update [options] <name> ...\n"
+"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
+
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - أجبر تحديث مفتاح gpg.\n"
+
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - اختر كلّ الوسائط الغير قابلة للإزالة.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - تأكّد من توقيع rpm قبل التّثبيت\n"
-"                   (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
-"افتراضي.)\n"
+"المدخل المطلوب تحديثه غير موجود\n"
+"(واحد من %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf الإصدار %s\n"
+"جميع الحقوق محفوظة 2000، 2001، 2002 MandrakeSoft.\n"
+"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - اسرد الحزم المتوفّرة.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - اعمل وسيط تحديث.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - اسرد الوسائط المتوفّرة وعناوينها.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - افرض البحث التّقريبيّ (مثل --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "   --dump-config  - أكتب الإعداد على شكل متغيّر لـ urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "موافق"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - اسرد النقاط المتوفّرة عند استخدام --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "وصف hdlist غير صالح \"%s\" في ملف hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - إصنع قائمة للأسماء المستعارة الموازية.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "جاري إزالة %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - استخرج الترويسات للحزمة المسردة من قاعدة بيانات urpmi "
+"إلى\n"
+"                   stdout (المستخدم root فقط).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"   --distrib-XXX  - أنشئ آليا وسيطا للجزء XXX من\n"
-"                   توزيعة، يمكن لـXXX أن يكون رئيسيا (main)، مساهمة (contrib)"
-"، تحديثات (updates) أو\n"
-"                   أيّ شيئ آخر قد تمّ إعداده ؛-)\n"
+"  --sources      - أعط كل الحزم المصدريّة قبل تنزيلها (المستخدم root فقط).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - أعدّ urpmi بشكل سريع من شجرة التوزيعة.\n"
+"                   يسمح هذا بالاستعلام من توزيعة.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "كي يتم الحفاظ على %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - اطبع سجلّ التغيير.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "بسبب عدم ارضاء %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - وسّع الاستعلام ليشتمل المعتمدات.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"التثبيت الآلي للحزم...\n"
-"لقد طلبت تثبيت الحزمة %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "تم اقفال قاعدة بيانات urpmi"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - أكمل نقل الملفّات المنزّلة جزئيّاً\n"
-"                   (يقوم الخيار --no-resume بتعطيله، والوضع الافتراضي هو "
-"معطّل).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - مخرجات تامّة مع الحزمة الواجب حذفها.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - اعكس البحث لما يتطلّب هذه الحزمة.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - اطبع معلومات مفيدة بشكل مقروء للإنسان.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"أنت على وشك تثبيت حزمة البرنامج التالية على جهازك:\n"
-"\n"
-"%s\n"
-"\n"
-"قد ترغب بحفظها فقط. ما هو اختيارك؟"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - افرض البحث التقريبي (مثل -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - حاول أن تجد وتستخدم ملف hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes يمكن استخدامه فقط مع --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "بسبب فقدان %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "لم يتم ايجاد قائمة وسائط كاملة"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"الاستخدام: urpmi.update [options] <name> ...\n"
-"حيث أن <name> هو اسم الوسيط المطلوب تحديثه.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "جاري محاولة تخطّي الوسيط الموجود \"%s\"، جري التجاهل"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "واحد من هذه الحدم يُحتاج اليه لتثبيت %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq الإصدار %s\n"
+#~ "جميع الحقوق محفوظة 2000، 2001، 2002 MandrakeSoft.\n"
+#~ "هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+#~ "\n"
+#~ "الاستخدام:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "أداة تنزيل غير معروفة `%s' !!!\n"
@@ -2089,9 +2146,6 @@ msgstr "  --test         - تحقّق إن كان بالإمكان التثبي�
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "جرّب urpmf --help للمزيد من الخيارات"
 
-#~ msgid "no full media list was found"
-#~ msgstr "لم يتم ايجاد قائمة وسائط كاملة"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "جاري نسخ قائمة المصدر لـ\"%s\"..."
 
@@ -2254,4 +2308,3 @@ msgstr "  --test         - تحقّق إن كان بالإمكان التثبي�
 
 #~ msgid "no webfetch (curl or wget for example) found\n"
 #~ msgstr "لم يمكن ايجاد وسيلة لتنزيل الملفات (curl أو wget مثلا)\n"
-
diff --git a/po/az.po b/po/az.po
index aaa0e243..ca27c992 100644
--- a/po/az.po
+++ b/po/az.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-19 12:56+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -37,868 +37,775 @@ msgstr "YyBb"
 msgid "Nn"
 msgstr "XxJjNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s qurulur\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - bütün medyaları avtomatik olaraq qurulum medyumundan\n"
-"                    yarat.\n"
+"Paketlərin öz özünə qurulması...\n"
+"%s paketlərininin qurulmasını istədiniz\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmb açıla bilmir"
+msgid "Is this OK?"
+msgstr "Oldu mu?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - bu kömək ismarışını çap edər.\n"
+msgid "Ok"
+msgstr "Oldu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Ləğv et"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s peketi silinir"
+msgid " (Y/n) "
+msgstr " (B/x) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: əmr tapılmadı\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "use-distrib modu ilə bərabər paralel mod işlədilə bilməz"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "hər şey onsuzda quruludur"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - bu kömək ismarışını çap edər.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using process %d for executing transaction"
-msgstr "keçiş icrası üçün %d gedişatı istifadə edilir"
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçiminiz? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch tapılmadı, dəstəklənən webfetch-lər: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "ön yaddaşda %d başlıq tapıldı"
+msgid "unable to handle protocol: %s"
+msgstr "protokol istifadə edilə bilmir: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "\"%s\" rpm fayl adlı birdən çox fayl tapıldı"
+msgid "syntax error in config file at line %s"
+msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - vəkil səlahiyyətləndirilməsi üçün istifadə ediləcək\n"
-"                   istifadəçi adı və şifrə (istifadə qaydası: <istifadəçi:"
-"şifrə>).\n"
+"\"%s\" medyumu istifadədə olan hdlist'i işlətməyə cəhd etdi, medya rədd "
+"edildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "asıllılıqlar hesablanmaq üçün ikinci dəfə sınanır\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" medyumu onsuz da istifadədə olan siyahını işlətməyə cəhd etdi, medyum "
+"rədd edildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] rpm faylı alınır ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
+"diqqətə alına bilir"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - mövcud paralel aliasları sırala.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...alış bacarılmadı: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" faylları siyahısı yoxlana bilmir, medya rədd edildi"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - OR operatoru, ifadələrdən biri doğrudursa nəticə doğru "
-"olacaq.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Paket qurulumu..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "hökmsüz rpm fayı adı [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"\"%s\" medyasının hdlist ya da siyahı faylı tə'yin edilməməlidir, medya rədd "
+"edildi"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d qurulum daşınmaları bacarılmadı"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "\"%s\" virtual medyumunun düzgün url'si olmalıdır, mediyum rədd edildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"birinci qurulum mediyasına yetişə bilmədim (Mandrake/base/hdlists faylı "
-"tapıla bilmədi)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xətalı seçənək, təkrar sınayın\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Qeyd ediləcək ünvanı seçin"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - taq icmalını göstər: icmal.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" faylları siyahısı yoxlana bilmir, medya rədd edildi"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Qur"
+msgid "taking removable device as \"%s\""
+msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X ara üzünü işlət.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazıla bilmir"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - mühitə görə ən yaxşı olan ara üzü seç:\n"
-"                   X ya da mətn modu.\n"
+msgid "write config file [%s]"
+msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "`%s' paketi endirilir..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "use-distrib modu ilə bərabər paralel mod işlədilə bilməz"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "--install-src istifadə edildiyində rpm faylları ilə nə edilə biləcəyi"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "[%s] faylındakı paralel tutucu yoxlanır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "%s adlı paket yoxdur"
+msgid "found parallel handler for nodes: %s"
+msgstr "düyümlər üçün paralel tutucu tapıldı: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "paralel mod üçün əlaqələndirilmiş mediya işlədilir: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Qurulum bacarılmadı, bəzi fayllar əksikdir:\n"
-"%s\n"
-"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
+msgid "unable to use parallel option \"%s\""
+msgstr " \"%s\" paralel seçənəyi işlədilə bilmədi"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"istifadə qaydası: urpmi.removemedia [-a] <ad> ...\n"
-"buradakı <ad> silinəcək mediyanın adıdır.\n"
+"--synthesis bunlarla bərabər istifadə edilə bilməz: --media, --excludemedia, "
+"--sortmedia, --update ya da --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
-"aşağıdakı paketlərin çıxardılması lazımdır:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "[%s] synthesis faylı sınanır "
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "'with' şəbəkə medyasında əksikdir\n"
+msgid "examining hdlist file [%s]"
+msgstr "[%s] hdlist faylı yoxlanır"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - paketdəki faylları göstər.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "\"%s\" vertual medyumu  yerli deyil, medyum rədd edildi"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "na'məlum paket "
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "\"%s\" medyasının hdlist ya da synthesis faylı oxuna bilmədi"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Qurulum mümkündür"
+msgid "performing second pass to compute dependencies\n"
+msgstr "asıllılıqlar hesablanmaq üçün ikinci dəfə sınanır\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "%s paketi keçilir"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "%s yeniləmə paketi yerinə qurula bilər"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "\"%s\" medyası [%s] siyahı faylına malik olmadığı üçün alına bilmir"
+msgid "unable to open rpmdb"
+msgstr "rpmb açıla bilmir"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (b/X) "
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" medyası onsuz da vardır"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "cooker distribyusiyasının yeniləmələrini əlavə edə bilmərəm\n"
+msgid "virtual medium need to be local"
+msgstr "virtual mediyum yerli olmalıdır"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - təfsilatlı mod.\n"
+msgid "added medium %s"
+msgstr "%s medyası əlavə edildi"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Başladılır..."
+msgid "unable to access first installation medium"
+msgstr "Birinci qurulum medyumuna yetişilə bilmir"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - mövcud paketləri göstər.\n"
+msgid "copying hdlists file..."
+msgstr "hdlist faylı köçürdülür..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - bütün təqləri göstər.\n"
+msgid "...copying failed"
+msgstr "...köçütrmə bacarılmadı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
+msgid "...copying done"
+msgstr "...köçürtmə bitdi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"\"%s\" medyasının hdlist ya da siyahı faylı tə'yin edilməməlidir, medya rədd "
-"edildi"
+"birinci qurulum mediyasına yetişə bilmədim (Mandrake/base/hdlists faylı "
+"tapıla bilmədi)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"köçürdülmüş mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
+msgid "retrieving hdlists file..."
+msgstr "hdlists faylı alınır..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - vergüllə ayrılmış daxil etməmə çığırı.\n"
+msgid "...retrieving done"
+msgstr "...alınma bitdi"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Hazır olanda Enter düyməsinə basın..."
+msgid "...retrieving failed: %s"
+msgstr "...alış bacarılmadı: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"naməlum seçənəklər '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlists faylında hökmsüz \"%s\" hdlist izahatı"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - veriləndən çox paket qurulacaq ya da yenilənəcəksə\n"
-"                   daha qısa keçişlərə böl,\n"
-"                   əsas qiymət: %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "\"%s\" medyasının hdlist ya da synthesis faylı oxuna bilmədi"
+msgid "selecting multiple media: %s"
+msgstr "birdən çox medya seçilir: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - wget'i uzaqdakı faylları almaq üçün işlədin.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "\"%s\" medyumu çıxardılır"
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
-"ver.\n"
+"\"%s\" mediyumuna yetişə bilmədim,\n"
+"bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - mövcud düyümləri --paralel işlədərkən göstər.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"\"%s\" virtual medyumunun hökmlü mənbə hdlist'i ya da synthesis'i olmalıdır, "
+"medya rədd edildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] hdlist faylı inşa edilir"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" faylının izahat faylı köçürdülür..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - mümkündürsə, mövcud paketləri saxlamaya çalış, "
-"paketlərin\n"
-"                   silinməsini məcbur qılan paketləri rədd et.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "mövcud mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM faylı sınanır"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: əmr tapılmadı\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı köçürdülür..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
-"  --allow-nodeps - istifadəçiyə paketi asıllılıqları diqqətə almadan\n"
-"                   qurma sualı verməyə icazə ver.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "protokol istifadə edilə bilmir: %s"
+"köçürdülmüş mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists faylı alınır..."
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr "Bəli, qur"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "%s medyası əlavə edildi"
+msgid "reading rpm files from [%s]"
+msgstr "rpm faylları [%s] üstündən oxunur"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s]'dan rpm faylı oxuna bilmir: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "%s üstündə qurma üçün keçiş bitdi (sil=%d, qul=%d, yenilə=%d)"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum uyğunsuzluğu"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "quraşdırma faylında %s sətirində sintaksis xətası"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  əmr sətirində verilən adlar ya da rpm faylları qurulacaq.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - müəyyən edilmiş HTTP vəkilini işlət, qapı nömrəsi əsas "
-"olaraq\n"
-"                   1080 qəbul edilir (istifadə qaydası: <vəkilqovşaq[:qapı]"
-">).\n"
+msgid "md5sum mismatch"
+msgstr "md5sum uyğunsuzluğu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "in order to install %s"
-msgstr "%s paket(lər)ini qurmaq üçün"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "mənbə hdlist (ya da synthesis) faylının alınması bacarılmadı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "[%s] faylı onsuzda eyni \"%s\" mediyumda işlədilib"
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" hdlist faylı alına bilmir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s yeniləmə paketi yerinə qurula bilər"
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" fayl siyahısı yazıla bilmi"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "%s ünvanındakı mirrorlar alınır ..."
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - taq url'sini göstər: url.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s üçün müəyyən edilən protokol namə'lumdur"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" faylının pubkey'si yoxlanır..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - adla birlikdə buraxılış və yayını da göstər.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "\"%s\"  faylının pubkey'si idxal edilə bilmədi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" medyası onsuz da vardır"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "%s qurulur\n"
+msgid "building hdlist [%s]"
+msgstr "[%s] hdlist faylı inşa edilir"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"güncəllənəcək giriş mövcud deyildir\n"
-"(%s dan (dən) biri)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr "%s irəliləndirməyə çalışılır"
+msgid "found %d headers in cache"
+msgstr "ön yaddaşda %d başlıq tapıldı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "%s paketi çıxardıla bilmədi"
+msgid "removing %d obsolete headers in cache"
+msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
+msgid "mounting %s"
+msgstr "%s bağlanır"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"çıxardılacaq giriş mövcud deyildir\n"
-"(%s dan (dən) biri)\n"
+msgid "unmounting %s"
+msgstr "%s ayrılır"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "   -a            - medya seç.\n"
+msgid "relocated %s entries in depslist"
+msgstr "asılılıqlar siyahısında %s sahə yenidən yerləşdirildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Əksik imza (%s)"
+msgid "no entries relocated in depslist"
+msgstr "depslist siyahısındakı heç bir giriş yerini dəyişdirməyib"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s]'dan rpm faylı oxuna bilmir: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "[%s] rpm faylı alınır ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
+msgid "unable to access rpm file [%s]"
+msgstr "rpm faylı [%s] çatıla bilmir"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
+msgid "unable to register rpm file"
+msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (B/x) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - taq qrupunu göstər: qrup.\n"
+msgid "error registering local packages"
+msgstr "yerli paket qeydiyyat xətası"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"\"%s\" medyumu onsuz da istifadədə olan siyahını işlətməyə cəhd etdi, medyum "
-"rədd edildi"
+msgid "no package named %s"
+msgstr "%s adlı paket yoxdur"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "xətalı giriş: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketini silmək sisteminizi pozacaq"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "\"%s\" rpm fayl adlı birdən çox fayl tapıldı"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - mövcud medyanı göstər.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "\"%s\" qiymətindəki [%s] düzgün oxuna bilmədi"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Bəzi istənən paketlər qurula bilmir:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' paketi qurulur (%s/%s)..."
+"\"%s\" mediyumu hökmsüz siyahı  faylı işlədir:\n"
+"  yəqin ki əks yenilənməyib, alternativ yöntəmi işlətməyə çalışıram"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "depslist siyahısındakı heç bir giriş yerini dəyişdirməyib"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "\"%s\" mediyumu hər hansı bir rpm faylının mövqeyini bildirmir"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - ancaq mənbə paketini qur (ikililəri yox).\n"
+msgid "package %s is not found."
+msgstr "%s paketi tapılmadı."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
+msgid "urpmi database locked"
+msgstr "urpmi databeyzi qıfıllıdır"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" medyası seçili deyil"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "razısınız ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün inkoherent siyahı faylı, medya rədd edildi"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...alınma bitdi"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" medyasına çatıla bilmir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s paketi əlavə edilir (id=%d, eid=%d, yeniləmə=%d, fayl=%s)"
+msgid "malformed input: [%s]"
+msgstr "xətalı giriş: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "%s paketi keçilir"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "\"%s\" mediyumundan rpm faylları alınır..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Hökmsüz imza (%s)"
+msgid "Preparing..."
+msgstr "Hazırlanır..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
+msgid "using process %d for executing transaction"
+msgstr "keçiş icrası üçün %d gedişatı istifadə edilir"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi buraxılışı %s\n"
-"Təlif Hüququ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə şəkli:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "\"%s\" qiymətindəki [%s] düzgün oxuna bilmədi"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "bu [%s] hdlist faylı medyası tapıla bilmədi"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "%s üstündə qurma üçün keçiş bitdi (sil=%d, qul=%d, yenilə=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" hdlist faylı alına bilmir"
+msgid "unable to create transaction"
+msgstr "keçiş yaradıla bilmir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"\"%s\" medyumu istifadədə olan hdlist'i işlətməyə cəhd etdi, medya rədd "
-"edildi"
+msgid "removing package %s"
+msgstr "%s peketi silinir"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "%s ilə yaranan toqquşma səbəbiylə"
+msgid "unable to remove package %s"
+msgstr "%s paketi çıxardıla bilmədi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ön yaddaşdakı %d mütləq başlıqlar çıxardılır"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s paketi əlavə edilir (id=%d, eid=%d, yeniləmə=%d, fayl=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr " \"%s\" medyası güncəllənə bilmir\n"
+msgid "unable to install package %s"
+msgstr "%s paketi qurula bilmədi"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-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) "
+msgid "due to missing %s"
+msgstr "%s əksik olduğuna görə"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "\"%s\" vertual medyumu  yerli deyil, medyum rədd edildi"
+msgid "due to unsatisfied %s"
+msgstr "razı qalmayan %s olduğuna görə"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Hazırlanır..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - paketdəki faylları göstər.\n"
+msgid "trying to promote %s"
+msgstr "%s irəliləndirməyə çalışılır"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
+msgid "in order to keep %s"
+msgstr "%s'ı saxlamaq üçün"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - hər hansı bir synthesis ya da hdlist\n"
-"                   faylı tapmaya cəhd göstərmə.\n"
+msgid "in order to install %s"
+msgstr "%s paket(lər)ini qurmaq üçün"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - paketi tapmaq üçün verilənlər arasında axtarma.\n"
+msgid "due to conflicts with %s"
+msgstr "%s ilə yaranan toqquşma səbəbiylə"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
+msgid "unrequested"
+msgstr "tələb edilməmiş"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
+msgid "Invalid signature (%s)"
+msgstr "Hökmsüz imza (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Hökmsüz Qiymət ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
+msgid "Missing signature (%s)"
+msgstr "Əksik imza (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"adsız medya üçün \"%s\" adı işlədilə bilmir, çünkü onsuz da istifadədədir"
+msgid "bad proxy declaration on command line\n"
+msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"\"%s\" virtual medyumunun hökmlü mənbə hdlist'i ya da synthesis'i olmalıdır, "
-"medya rədd edildi"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xətalı seçənək, təkrar sınayın\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -915,1080 +822,1219 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - bu kömək ismarışını çap edər.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"istifadə qaydası: urpmi.addmedia [seçənəklər] <ad> <url> [<nisbi_cığır> "
-"ilə]\n"
-"burada <url> aşağıdakılardan biridir\n"
-"      file://<cığır>\n"
-"      ftp://<istifadəçi adı>:<şifrə>@<verici>/<cığır> və <hdlist'in nisbi "
-"fayl adı>\n"
-"      ftp://<verici>/<cığır> və <hdlist'in nisbi fayl adı>\n"
-"      http://<verici>/<cığır> və <hdlist'in nisbi fayl adı>\n"
-"      removable://<cığır>\n"
-"\n"
-"və [seçənəklər] buradan gəlir\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı köçürdülür..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...köçürtmə bitdi"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr " \"%s\" paralel seçənəyi işlədilə bilmədi"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"\"%s\" mediyumu hökmsüz siyahı  faylı işlədir:\n"
-"  yəqin ki əks yenilənməyib, alternativ yöntəmi işlətməyə çalışıram"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "Birinci qurulum medyumuna yetişilə bilmir"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - təfsilatlı mod.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtual mediyum yerli olmalıdır"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "yerli paket qeydiyyat xətası"
+msgid "unknown packages"
+msgstr "namə'lum paketlər"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - endirmə sür'ətinə sərhəd qoy .\n"
+msgid "unknown package"
+msgstr "na'məlum paket "
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
+msgid "removing package %s will break your system"
+msgstr "%s paketini silmək sisteminizi pozacaq"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "mənbə hdlist (ya da synthesis) faylının alınması bacarılmadı"
+msgid "Nothing to remove"
+msgstr "Silinəcək heç bir şey yoxdur"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
+msgid "Checking to remove the following packages"
+msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" üçün siyahı faylında bir şey yazılmır"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+msgid " (y/N) "
+msgstr " (b/X) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "mövcud mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
+msgid "removing %s"
+msgstr "%s silinir"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - silinəcək paketlə çıxışı başa çatdır.\n"
+msgid "Removing failed"
+msgstr "Çıxartma bacarılmadı"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf buraxılış %s\n"
+"Tə'lif Hüququ (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə qaydası:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s paketi qurula bilmədi"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
-"                   yoxlanmadan qurma sualı verməyə icazə ver.\n"
+"  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Faylı qeyd et"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazıla bilmir"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr "  --quiet        - taq adlarını göstərmə.\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - identik sətirləri göstərmə.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Hökmsüz Qiymət ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - bütün təqləri göstər.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - taq icmalını göstər: icmal.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "tələb edilməmiş"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "rpm faylı [%s] çatıla bilmir"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - taq fayllarını göstər: bütün fayllar.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Quruluma davam etmək istəyirsiniz ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - taq fayllarını göstər: bütün fayllar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" medyasından [%s] rpm faylı oxuna bilmir"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr ""
+"  --env          - xüsusi mühit işlət (əsasən bir xəta\n"
+"                   raportu).\n"
 
-#: ../urpmq:1
+#: ../urpmf:59
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  -i             - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
-"göstər.\n"
+"  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --version      - müəyyən edilən distribyusiya buraxılışını işlət, əsası\n"
-"                   qurulu olan mandrake-release paketindən alınan\n"
-"                   distribyusiya buraxılışıdır.\n"
+"  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - əkslərin siyahısı üçün verilən url'ni işlət, əsası\n"
-"                   %s\n"
+"  -a             - binary AND operatoru, ifadələrin ikisi də doğru isə "
+"nəticə də doğrudur.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - OR operatoru, ifadələrdən biri doğrudursa nəticə doğru "
+"olacaq.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - NOT operatoru, ifadə səhv isə nəticə doğru olacaq.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - sol mötərizə qrup ifadəsini açmaq üçün.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
-"işlədin"
+"geri çağırış :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s ayrılır"
+msgid "using specific environment on %s\n"
+msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
-"işlədin)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% bitdi, sür'ət = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi buraxılışı %s\n"
+"Təlif Hüququ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə şəkli:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi yenidən başladılır"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "[%s] synthesis faylı sınanır "
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...köçütrmə bacarılmadı"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - mümkündürsə, mövcud paketləri saxlamaya çalış, "
+"paketlərin\n"
+"                   silinməsini məcbur qılan paketləri rədd et.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - veriləndən çox paket qurulacaq ya da yenilənəcəksə\n"
+"                   daha qısa keçişlərə böl,\n"
+"                   əsas qiymət: %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - səssiz mod.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - kiçik keçiş uzunluqu, əsasən %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - təfsilatlı mod.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
-"istifadəçi).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  -src           - növbəti paket mənbə paketidir (--s ilə eyni).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - urpmi db üçün sıralanan üst mə'lumatları çıxart\n"
-"                   (ancaq ali istifadəçi).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - ancaq mənbə paketini qur (ikililəri yox).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "namə'lum paketlər"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "birdən çox medya seçilir: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
+"  --allow-nodeps - istifadəçiyə paketi asıllılıqları diqqətə almadan\n"
+"                   qurma sualı verməyə icazə ver.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "[%s] faylı onsuzda eyni \"%s\" mediyumda işlədilib"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
+"                   yoxlanmadan qurma sualı verməyə icazə ver.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"çıxardılacaq bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - wget'i uzaqdakı faylları almaq üçün işlədin.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - bu kömək ismarışını çap edər.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "düyümlər üçün paralel tutucu tapıldı: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - endirmə sür'ətinə sərhəd qoy .\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"geri çağırış :\n"
-"%s\n"
+"  --resume       - qismən endirilən faylların transferini davam et\n"
+"                   (--no-resume bunu qeyri-fəallaşdırır, əsasən qeyri-"
+"fəaldır).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - müəyyən edilmiş HTTP vəkilini işlət, qapı nömrəsi əsas "
+"olaraq\n"
+"                   1080 qəbul edilir (istifadə qaydası: <vəkilqovşaq[:qapı]"
+">).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf buraxılış %s\n"
-"Tə'lif Hüququ (C) 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə qaydası:\n"
+"  --proxy-user   - vəkil səlahiyyətləndirilməsi üçün istifadə ediləcək\n"
+"                   istifadəçi adı və şifrə (istifadə qaydası: <istifadəçi:"
+"şifrə>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr "  --quiet        - taq adlarını göstərmə.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug          - bir sonrakı verilən arqumentlə verilmiş cərgəyə\n"
+"                   xəta raportunu yaz.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - identik sətirləri göstərmə.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X ara üzünü işlət.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis bunlarla bərabər istifadə edilə bilməz: --media, --excludemedia, "
-"--sortmedia, --update ya da --parallel"
+"  --best-output  - mühitə görə ən yaxşı olan ara üzü seç:\n"
+"                   X ya da mətn modu.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - verilən memarlığı işlət, əsası qurulmuş\n"
-"                   mandrake-release paketinin memarlığıdır.\n"
+"  --verify-rpm   - qurmadan əvvəl rpm imzasını yoxla\n"
+"                   (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
+"fəaldır).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Oldu mu?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - vergüllə ayrılmış daxil etməmə çığırı.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - sənəd fayllarını ixrac et.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - əmr sətirindəki bütün uyğun gələnləri seç.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "[%s] faylındakı paralel tutucu yoxlanır"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
+"ver.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Silinəcək heç bir şey yoxdur"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - paketi tapmaq üçün verilənlər arasında axtarma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - növbəti paket mənbə paketidir (--src ilə eyni).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - sorğunu paketin asıllılıqlarına qədər uzat.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - səssiz mod.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - bir sonrakı verilən arqumentlə verilmiş cərgəyə\n"
-"                   xəta raportunu yaz.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  əmr sətirində verilən adlar ya da rpm faylları qurulacaq.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "\"%s\" mediyumu hər hansı bir rpm faylının mövqeyini bildirmir"
+msgid "Choose location to save file"
+msgstr "Qeyd ediləcək ünvanı seçin"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "--install-src istifadə edildiyində rpm faylları ilə nə edilə biləcəyi"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" fayl siyahısı yazıla bilmi"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Siz bu mənbə paketini seçdiniz:\n"
+"\n"
+"%s\n"
+"\n"
+"Deyəsən bunu qurmaq istəmirdiniz (bunun qurulmsı\n"
+"halında mənbə kodunda dəyişikliklər edilib yenidən dərlənə bilər).\n"
+"\n"
+"İndi nə etmək istəyirsiniz?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
+msgid "Do nothing"
+msgstr "Heçnə etmə"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
+msgid "Yes, really install it"
+msgstr "Bəli, qur"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - taq izahatını göstər: izahat.\n"
+msgid "Save file"
+msgstr "Faylı qeyd et"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Köçütrmə bacarılmadı"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Sisteminizə bu paketləri quracaqsınız:\n"
+"\n"
+"%s\n"
+"\n"
+"Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
+"Seçiminiz nədir?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
+msgid "Install it"
+msgstr "Qur"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"[%s] qovluğu onsuz da mövcuddur, xahiş edirik xəta raportu üçün başqa qovluq "
+"işlədin"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" medyası hdlist faylı tapılmadı"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Xəta raportu üçün [%s] cərgəsi yaradıla bilmədi"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - növbəti paket mənbə paketidir (--src ilə eyni).\n"
+msgid "Copying failed"
+msgstr "Köçütrmə bacarılmadı"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "%s qurulur"
+msgid "Only superuser is allowed to install packages"
+msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "rpm faylları [%s] üstündən oxunur"
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" faylının izahat faylı köçürdülür..."
+msgid "What is your choice? (1-%d) "
+msgstr "Seçiminiz? (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
+msgid "Package installation..."
+msgstr "Paket qurulumu..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Çıxartma bacarılmadı"
+msgid "Initializing..."
+msgstr "Başladılır..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - həmişə yeni qalan virtual mediya yarat,\n"
-"                   ancaq file:// protokoluna icazə var.\n"
+"Bəzi istənən paketlər qurula bilmir:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "%s paketi tapılmadı."
+msgid "do you agree ?"
+msgstr "razısınız ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" medyumu çıxardılır"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
+"aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Ləğv et"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  -src           - növbəti paket mənbə paketidir (--s ilə eyni).\n"
+msgid "unable to get source packages, aborting"
+msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - xüsusi mühit işlət (əsasən bir xəta\n"
-"                   raportu).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
+msgid "Press Enter when ready..."
+msgstr "Hazır olanda Enter düyməsinə basın..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" medyasına çatıla bilmir"
+msgid "Downloading package `%s'..."
+msgstr "`%s' paketi endirilir..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr " \"%s\" medyası yaradıla bilmir\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s bitdi, QV = %s, sür'ət = %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% bitdi, sür'ət = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - qurğuları urpmi.addmedia arqumenti formasında göstər.\n"
+msgid "The following packages have bad signatures"
+msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
 
-#: ../urpmi:1
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Quruluma davam etmək istəyirsiniz ?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
+"Qurulum bacarılmadı, bəzi fayllar əksikdir:\n"
 "%s\n"
+"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - dəyişmə qeydi faylını göstər.\n"
+msgid "Installation failed"
+msgstr "Qurulum iflas etdi"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
+msgid "distributing %s"
+msgstr "%s paylanır"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
+msgid "installing %s"
+msgstr "%s qurulur"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch tapılmadı, dəstəklənən webfetch-lər: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' paketi qurulur (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "[%s] hdlist faylı yoxlanır"
+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) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlist faylı köçürdülür..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
+msgid "%d installation transactions failed"
+msgstr "%d qurulum daşınmaları bacarılmadı"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "\"%s\" virtual medyumunun düzgün url'si olmalıdır, mediyum rədd edildi"
+msgid "Installation is possible"
+msgstr "Qurulum mümkündür"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
+msgid "Everything already installed"
+msgstr "hər şey onsuzda quruludur"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Heçnə etmə"
+msgid "restarting urpmi"
+msgstr "urpmi yenidən başladılır"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"istifadə qaydası: urpmi.addmedia [seçənəklər] <ad> <url> [<nisbi_cığır> "
+"ilə]\n"
+"burada <url> aşağıdakılardan biridir\n"
+"      file://<cığır>\n"
+"      ftp://<istifadəçi adı>:<şifrə>@<verici>/<cığır> və <hdlist'in nisbi "
+"fayl adı>\n"
+"      ftp://<verici>/<cığır> və <hdlist'in nisbi fayl adı>\n"
+"      http://<verici>/<cığır> və <hdlist'in nisbi fayl adı>\n"
+"      removable://<cığır>\n"
+"\n"
+"və [seçənəklər] buradan gəlir\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "paralel mod üçün əlaqələndirilmiş mediya işlədilir: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - yeniləmə mediyumu yarat.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s bağlanır"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"\"%s\" medyası siyahı faylı başqa medya tərəfindən istifadədə olduğu üçün "
-"diqqətə alına bilir"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "qaynaq paketi alına bilmir, çıxılır"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - hər hansı bir synthesis ya da hdlist\n"
+"                   faylı tapmaya cəhd göstərmə.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - bütün medyaları avtomatik olaraq qurulum medyumundan\n"
+"                    yarat.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s bitdi, QV = %s, sür'ət = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - distribyusiyanın XXX hissəsi üçün avtomatik olaraq\n"
+"                   mediyum yarat, XXX main, contrib, updates ya da\n"
+"                   quraşdırılmış hər şey ola bilər ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - əkslərin siyahısı üçün verilən url'ni işlət, əsası\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "\"%s\"  faylının pubkey'si idxal edilə bilmədi"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - müəyyən edilən distribyusiya buraxılışını işlət, əsası\n"
+"                   qurulu olan mandrake-release paketindən alınan\n"
+"                   distribyusiya buraxılışıdır.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - paket silməyi qətiyyən soruşma, qurulumu bitir.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - verilən memarlığı işlət, əsası qurulmuş\n"
+"                   mandrake-release paketinin memarlığıdır.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq buraxılışı %s\n"
-"Təlif Hüququ (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə qaydası:\n"
+"  --virtual      - həmişə yeni qalan virtual mediya yarat,\n"
+"                   ancaq file:// protokoluna icazə var.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "   -c            - başlıq ara yaddaşı cərgəsini təmizlə.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" medyası seçili deyil"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "cooker distribyusiyasının yeniləmələrini əlavə edə bilmərəm\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "%s ünvanındakı mirrorlar alınır ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" üçün hdlist faylı tapıla bilmir, medya rədd edildi"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - kiçik keçiş uzunluqu, əsasən %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr " \"%s\" medyası güncəllənə bilmir\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - sol mötərizə qrup ifadəsini açmaq üçün.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
+msgid "`with' missing for network media\n"
+msgstr "'with' şəbəkə medyasında əksikdir\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binary AND operatoru, ifadələrin ikisi də doğru isə "
-"nəticə də doğrudur.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr " \"%s\" medyası yaradıla bilmir\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"\"%s\" mediyumuna yetişə bilmədim,\n"
-"bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
+"istifadə qaydası: urpmi.removemedia [-a] <ad> ...\n"
+"buradakı <ad> silinəcək mediyanın adıdır.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - taq qrupunu göstər: qrup.\n"
+msgid "  -a             - select all media.\n"
+msgstr "   -a            - medya seç.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media       - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "keçiş yaradıla bilmir"
+"\n"
+"naməlum seçənəklər '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "\"%s\" mediyumundan rpm faylları alınır..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"çıxardılacaq bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Siz bu mənbə paketini seçdiniz:\n"
-"\n"
-"%s\n"
-"\n"
-"Deyəsən bunu qurmaq istəmirdiniz (bunun qurulmsı\n"
-"halında mənbə kodunda dəyişikliklər edilib yenidən dərlənə bilər).\n"
-"\n"
-"İndi nə etmək istəyirsiniz?"
+"çıxardılacaq giriş mövcud deyildir\n"
+"(%s dan (dən) biri)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s paylanır"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"istifadə qaydası: urpmi.update [seçənəklər] <ad> ...\n"
+"buradakı <ad> yenilənəcək mediyumun adıdır.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Qurulum iflas etdi"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "[%s] quraşdırma faylı yazılır"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg açarını yeniləməyə məcbur et.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - çıxardıla bilməyən medya seç.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"güncəllənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia "
+"işlədin)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - qurmadan əvvəl rpm imzasını yoxla\n"
-"                   (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
-"fəaldır).\n"
+"güncəllənəcək giriş mövcud deyildir\n"
+"(%s dan (dən) biri)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf buraxılış %s\n"
+"Tə'lif Hüququ (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə qaydası:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - mövcud paketləri göstər.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - yeniləmə mediyumu yarat.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - mövcud medyanı göstər.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - mövcud medyanı və onların URL-lərini göstər.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - qurğuları urpmi.addmedia arqumenti formasında göstər.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Oldu"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - mövcud düyümləri --paralel işlədərkən göstər.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists faylında hökmsüz \"%s\" hdlist izahatı"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - mövcud paralel aliasları sırala.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "%s silinir"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - urpmi db üçün sıralanan üst mə'lumatları çıxart\n"
+"                   (ancaq ali istifadəçi).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - distribyusiyanın XXX hissəsi üçün avtomatik olaraq\n"
-"                   mediyum yarat, XXX main, contrib, updates ya da\n"
-"                   quraşdırılmış hər şey ola bilər ;-)\n"
+"  --sources      - endirmədən əvvəl bütün mənbə paketini ver (təkcə ali "
+"istifadəçi).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "%s'ı saxlamaq üçün"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - dəyişmə qeydi faylını göstər.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "razı qalmayan %s olduğuna görə"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - sorğunu paketin asıllılıqlarına qədər uzat.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Paketlərin öz özünə qurulması...\n"
-"%s paketlərininin qurulmasını istədiniz\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi databeyzi qıfıllıdır"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - qismən endirilən faylların transferini davam et\n"
-"                   (--no-resume bunu qeyri-fəallaşdırır, əsasən qeyri-"
-"fəaldır).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - silinəcək paketlə çıxışı başa çatdır.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" faylının pubkey'si yoxlanır..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
+"göstər.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - adla birlikdə qrupları da göstər.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Sisteminizə bu paketləri quracaqsınız:\n"
-"\n"
-"%s\n"
-"\n"
-"Bunun yerinə sadəcə olaraq qeyd etməyi də seçə bilərsiniz.\n"
-"Seçiminiz nədir?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - adla birlikdə buraxılış və yayını da göstər.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - fuzzy axtarmanı qəbul et ( -y ilə eyni).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - hdlist faylını tapıb işlətməyə çalış.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "%s əksik olduğuna görə"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"istifadə qaydası: urpmi.update [seçənəklər] <ad> ...\n"
-"buradakı <ad> yenilənəcək mediyumun adıdır.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
+#~ 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:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq buraxılışı %s\n"
+#~ "Təlif Hüququ (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "istifadə qaydası:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Namə'lum webfetch `%s' !!!\n"
diff --git a/po/bg.po b/po/bg.po
index 68eaf01a..fae77dc9 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-08-18 15:59+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -38,900 +38,877 @@ msgstr "ДдDdYy"
 msgid "Nn"
 msgstr "НнNn"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "инсталиране %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - автоматично създаване на всички източници от "
-"инсталационен\n"
-"                   източник.\n"
+"Автоматична инсталация на пакети ...\n"
+"Вие пожелахте инсталация на пакет %s\n"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "не мога да отворя rpmdb"
+msgid "Is this OK?"
+msgstr "Това добре ли е"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - показва това помощно съобщение.\n"
+msgid "Ok"
+msgstr "Добре"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Един от тези пакети е необходим за инсталация на %s:"
+msgid "Cancel"
+msgstr "Отказ"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "изтриване на пакет %s"
+msgid " (Y/n) "
+msgstr " (Д/н) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "%s: command not found\n"
+msgstr "%s: командата не е намерена\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "всичко е инсталирано вече"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - показва това помощно съобщение.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - почистване на хедър кеш директорията.\n"
+# msgstr "  --group         - отпечатва групата тагове: group."
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - отпечатва групата на тагове: group."
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
-"  --requires      - отпечатва изисквания на тага: всички изисквания "
-"(множество редове)."
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Какъв е вашият избор? (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "не мога да се справя с протокол %s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "found %d headers in cache"
-msgstr "намерени %d хедъра в кеша"
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
+"източникът \"%s\" прави опит да ползва вече използван hdlist, източникът е "
+"игнориран"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+# 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"
+#: ../urpm.pm:180
 #, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"посредникът \"%s\" прави опит да ползва вече използван лист, посредникът е "
+"игнориран"
+
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:196
+#, fuzzy, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"невъзможна грижата за посредника \"%s\" тъй като лист файла вече се ползва "
+"от друг посредник"
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:202
+#, fuzzy, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"невъзможно използването на името \"%s\" за неименувания посредник защото то "
+"е вече в употреба"
+
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:209
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"невъзможно вземането предвид на източник \"%s\" тъй като лист файла [%s] не "
+"съществува"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "получавам rpm файла [%s] ... "
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "невъзможно определянето на източника на този hdlist файл : [%s]"
 
-#: ../urpmq:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:222
 #, fuzzy, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - отпечатва всички тагове."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "невъзможен достъпа до hdlist файла на \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "... получаването не можа да се осъществи: %s"
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "невъзможен достъпа до лист файла на \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "невъзможен прегледа на лист файла за \"%s\", източника е игнориран"
+#: ../urpm.pm:249
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "опит за пренебрегване на съществуващия посредник \"%s\", отхвърлен"
 
-#: ../urpmf:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
+"виртулания източник \"%s\" не трябва да има дефиниран hdlist или файл-"
+"списък, източникът е игнориран"
 
-#: ../urpmi:1
-#, c-format
-msgid "Package installation..."
-msgstr "Инсталиране на пакети..."
+# 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"
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"посредника \"%s\" прави опит да ползва вече използван лист, посредника е "
+"игнориран"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "грешно rpm име на файла [%s]"
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:271
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "невъзможно намирането на hdlist файл за \"%s\", посредника е игнориран"
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:278
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "невъзможно да се намери лист файл за \"%s\", посредника е игнориран"
 
-#: ../urpmi:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:301
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d инсталационните транзакции не можаха да се осъществят"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "непоследователен списъков файл за \"%s\", посредника е игнориран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"невъзможен достъпа до източника за първоначална инсталация (не е намерен "
-"файла Mandrake/base/hdlists)"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "невъзможен прегледа на лист файла за \"%s\", източника е игнориран"
 
-#: ../urpm/msg.pm:1
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Съжалявам,лош избор, опитайте отново\n"
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:342
+#, fuzzy, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "твърде много точки на монтиране за сменяемия посредник \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Choose location to save file"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
-
-#: ../urpm.pm:1 ../urpme:1
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Тези пакети съдържат %s: %s"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Инсталацията провалена"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr ""
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "невъзможно възтановяването на пътя за сменяемия посредник \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Един от тези пакети е необходим:"
+msgid "unable to write config file [%s]"
+msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpme:1
-#, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
+#: ../urpm.pm:390
+#, fuzzy, c-format
+msgid "write config file [%s]"
+msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "Сваляне на пакет `%s'..."
+#: ../urpm.pm:412
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "невъзможно да се запише конфигурационен файл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
-"  --auto-select  - автоматично избира пакети за ъпгрейд на системата.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "no package named %s"
-msgstr "няма пакет наречен %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.removemedia:1
-#, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"употреба: urpmi.removemedia [-a] <име> ...\n"
-"където <име> е име на източник за премахване.\n"
+#: ../urpm.pm:441
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpm.pm:452
+#, fuzzy, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Инсталацията не може да продължи,защото следните пакети\n"
-"трябва да бъдат премахнати за да бъдат обновени други\n"
-"%s\n"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "`with' missing for network media\n"
-msgstr ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "  --all           - отпечатва всички тагове."
 
-#: ../urpmq:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list           - отпечатва всички налични пакети.\n"
-
-#: ../urpme:1
-#, c-format
-msgid "unknown package"
-msgstr "неизвестен пакет"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installation is possible"
-msgstr "Инсталацията е възможна"
-
-#: ../urpmi:1
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
-"обновени:\n"
-"%s"
+msgid "examining synthesis file [%s]"
+msgstr "създай hdlist синтез файл за посредник  \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"За да се запазят зависимостите,тези пакети ще бъдат инсталирани (%d MB)"
+msgid "examining hdlist file [%s]"
+msgstr "прочети синтез файла [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+# "list" is translated in the meaning of "list file"
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
-"невъзможно вземането предвид на източник \"%s\" тъй като лист файла [%s] не "
-"съществува"
+"посредника \"%s\" прави опит да ползва вече използван лист, посредника е "
+"игнориран"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid " (y/N) "
-msgstr " (Д/н) "
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "грешка при четенето на hdlist или synthesis файла от източника \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr " -v             - показва всички съобщения\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Initializing..."
-msgstr "Инициализация..."
-
-#: ../urpmq:1
+#: ../urpm.pm:563
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - отпечатва всички налични пакети.\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - отпечатва всички тагове.\n"
+msgid "skipping package %s"
+msgstr "пропускане на пакет %s"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"непоследователния източник \"%s\" е маркиран като отстраним но в "
-"действителност не е"
+msgid "would install instead of upgrade package %s"
+msgstr "ще инсталира,вместо да обвнови пакета %s"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"виртулания източник \"%s\" не трябва да има дефиниран hdlist или файл-"
-"списък, източникът е игнориран"
+msgid "unable to open rpmdb"
+msgstr "не мога да отворя rpmdb"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:622
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-
-#: ../urpmi:1
-#, c-format
-msgid "Press Enter when ready..."
-msgstr "Натиснете Enter,когато сте готови..."
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
+msgid "medium \"%s\" already exists"
+msgstr "източникът \"%s\" вече съществува"
 
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:661
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "грешка при четенето на hdlist или synthesis файла от източника \"%s\""
+msgid "added medium %s"
+msgstr "добавен източник %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:677
+#, fuzzy, c-format
+msgid "unable to access first installation medium"
+msgstr "невъзможен достъпа до посредника за първоначална инсталация"
 
-#: ../urpmi:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - отпечатва всички тагове."
+msgid "...copying failed"
+msgstr "...копирането се провали"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "building hdlist [%s]"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
+"невъзможен достъпа до източника за първоначална инсталация (не е намерен "
+"файла Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:691
 #, c-format
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "retrieving hdlists file..."
+msgstr "получаване на hdlists файла..."
 
-#: ../_irpm:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: командата не е намерена\n"
+msgid "...retrieving done"
+msgstr ""
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "unable to register rpm file"
-msgstr "невъзможно регистрирането на rpm файл"
+msgid "...retrieving failed: %s"
+msgstr "... получаването не можа да се осъществи: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "невалидно hdlist описание \"%s\" в hdlists файла"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "не мога да се справя с протокол %s"
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "опит за избор на несъществуващ посредник \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "получаване на hdlists файла..."
+#: ../urpm.pm:767
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "опит за избор на множество посредници: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "Yes, really install it"
+msgid "\"%s\""
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr "добавен източник %s"
+#: ../urpm.pm:783
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "премахване на посредника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:996
+#, fuzzy, c-format
 msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
+"посредника \"%s\" прави опит да ползва вече използван hdlist, посредника е "
+"игнориран"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "md5sum mismatch"
-msgstr ""
+#: ../urpm.pm:1004
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "нищо не е записано в лист файла за \"%s\""
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, fuzzy, c-format
-msgid "syntax error in config file at line %s"
-msgstr "невъзможно да се запише конфигурационен файл [%s]"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "in order to install %s"
-msgstr "за да може да се инсталира %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1109
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1111
 #, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "...копирането се провали"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "проблем при четенето на синтез файл за източник  \"%s\""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ще инсталира,вместо да обвнови пакета %s"
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "прочети синтез файла [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "получаване на огледални източници %s"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - отпечатва url тага: url.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "невъзможно четенето на rpm файлове от [%s] : %s"
 
-#: ../urpmq:1
-#, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
+#: ../urpm.pm:1204
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "прочети синтез файла [%s]"
 
-#: ../urpmf:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" already exists"
-msgstr "източникът \"%s\" вече съществува"
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
-msgstr "инсталиране %s\n"
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "trying to promote %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to remove package %s"
-msgstr "невъзможно премахването на пакет %s "
-
-#: ../urpm.pm:1
-#, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "проблем при четенето на синтез файл за източник  \"%s\""
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1490
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "не е намерен hdlist файл за пасредника \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "невъзможно да се парсне hdlist файла за \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "unable to write list file of \"%s\""
+msgstr "невъзможност да се запише лист файл за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "невъзможно четенето на rpm файлове от [%s] : %s"
-
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+#: ../urpm.pm:1586
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "не е намерен hdlist файл за пасредника \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "nothing written in list file for \"%s\""
+msgstr "нищо не е записано в лист файла за \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:1
-#, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - обновява само източници на обновяване.\n"
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (Д/н) "
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "невъзможност да се запише лист файл за \"%s\""
 
-# msgstr "  --group         - отпечатва групата тагове: group."
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - отпечатва групата на тагове: group."
+msgid "unable to import pubkey file of \"%s\""
+msgstr "невъзможност да се запише лист файл за \"%s\""
 
 # 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"
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "премахване на посредника \"%s\""
+
+#: ../urpm.pm:1684
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "building hdlist [%s]"
 msgstr ""
-"посредникът \"%s\" прави опит да ползва вече използван лист, посредникът е "
-"игнориран"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "malformed input: [%s]"
-msgstr "лош вход: [%s]"
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "създай hdlist синтез файл за посредник  \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
+msgid "found %d headers in cache"
+msgstr "намерени %d хедъра в кеша"
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - показва източниците.\n"
+#: ../urpm.pm:1749
+#, fuzzy, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "намерени %d хедъра в кеша"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
+#: ../urpm.pm:1893
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "монтиране на %s\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Инсталиране на пакет `%s' (%s/%s)..."
+#: ../urpm.pm:1906
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "монтиране на %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "грешно rpm име на файла [%s]"
 
-#: ../urpmf:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e              - включва perl код направо като perl -e .\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "получавам rpm файла [%s] ... "
 
-#: ../urpmi:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "do you agree ?"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "непоследователен списъков файл за \"%s\", посредника е игнориран"
+msgid "unable to register rpm file"
+msgstr "невъзможно регистрирането на rpm файл"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "...retrieving done"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "no package named %s"
+msgstr "няма пакет наречен %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "skipping package %s"
-msgstr "пропускане на пакет %s"
+msgid "The following packages contain %s: %s"
+msgstr "Тези пакети съдържат %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+
+#: ../urpm.pm:2362
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
+#: ../urpm.pm:2378
+#, c-format
+msgid "package %s is not found."
+msgstr "пакетът %s не е намерен."
+
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "донасяне,rpm база данни,провалено\n"
+
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+msgid "medium \"%s\" is not selected"
+msgstr "посредника \"%s\" не е избран"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2553
 #, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "невъзможно определянето на източника на този hdlist файл : [%s]"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"непоследователния източник \"%s\" е маркиран като отстраним но в "
+"действителност не е"
+
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm.pm:2574
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "невъзможен достъпа до посредника \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "невъзможно да се парсне hdlist файла за \"%s\""
+msgid "malformed input: [%s]"
+msgstr "лош вход: [%s]"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "Preparing..."
 msgstr ""
-"източникът \"%s\" прави опит да ползва вече използван hdlist, източникът е "
-"игнориран"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "due to conflicts with %s"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "намерени %d хедъра в кеша"
+#: ../urpm.pm:2783
+#, c-format
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
+msgid "unable to create transaction"
+msgstr "невъзможно създаването на посредника \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
+msgid "removing package %s"
+msgstr "изтриване на пакет %s"
 
-# 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"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr ""
-"посредника \"%s\" прави опит да ползва вече използван лист, посредника е "
-"игнориран"
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
+msgstr "невъзможно премахването на пакет %s "
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "Preparing..."
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2809
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list           - отпечатва всички налични пакети.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unable to install package %s"
+msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "due to missing %s"
+msgstr "липсва kdesu"
+
+#: ../urpm.pm:3010 ../urpm.pm:3040
+#, c-format
+msgid "due to unsatisfied %s"
 msgstr ""
-"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "...копирането се провали"
+msgid "in order to keep %s"
+msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpmq:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "in order to install %s"
+msgstr "за да може да се инсталира %s"
+
+#: ../urpm.pm:3047
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+#: ../urpm.pm:3092
+#, c-format
+msgid "Invalid Key ID (%s)"
 msgstr ""
-"невъзможно използването на името \"%s\" за неименувания посредник защото то "
-"е вече в употреба"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+#: ../urpm.pm:3094
+#, c-format
+msgid "Missing signature (%s)"
 msgstr ""
-"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
-"(множество редове)."
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
+#, c-format
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"посредника \"%s\" прави опит да ползва вече използван hdlist, посредника е "
-"игнориран"
 
-#: ../urpme:1
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr ""
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Съжалявам,лош избор, опитайте отново\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -942,1029 +919,1066 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - показва това помощно съобщение.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматично избиране на добър пакет от избора.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr " -v             - показва всички съобщения\n"
+
+#: ../urpme:50
 #, fuzzy, c-format
-msgid "unable to access first installation medium"
-msgstr "невъзможен достъпа до посредника за първоначална инсталация"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "неизвестен пакет(и)"
+
+#: ../urpme:83
 #, c-format
-msgid "virtual medium need to be local"
-msgstr ""
+msgid "unknown package"
+msgstr "неизвестен пакет"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "error registering local packages"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:95
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpme:99
 #, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+msgid "Checking to remove the following packages"
+msgstr "Един от тези пакети е необходим:"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
+
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, c-format
+msgid " (y/N) "
+msgstr " (Д/н) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, fuzzy, c-format
-msgid "no rpm files found from [%s]"
-msgstr "прочети синтез файла [%s]"
+msgid "removing %s"
+msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "нищо не е записано в лист файла за \"%s\""
+#: ../urpme:115
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...копирането се провали"
 
-#: ../urpmi:1
+#: ../urpmf:27
 #, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Тези пакети съдържат %s: %s"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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:33 ../urpmi:78 ../urpmq:44
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmq:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    команден ред но без име на пакет)."
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpm.pm:1
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Само superuser-а има правото да инсталира локални пакети"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:38
 #, c-format
-msgid "Save file"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+#: ../urpmf:39
+#, fuzzy, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - не отпечатва името на тага (по подразбиране ако не е "
+"зададен таг на командата"
+
+#: ../urpmf:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "невъзможно да се запише конфигурационен файл [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpme:1
+# msgstr "  --group         - отпечатва групата тагове: group."
+#: ../urpmf:43
 #, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
+
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "невъзможно възтановяването на пътя за сменяемия посредник \"%s\""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - отпечатва описание на тага: description."
 
-#: ../urpmi.addmedia:1
+# msgstr "  --group         - отпечатва групата тагове: group."
+#: ../urpmf:48
 #, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../urpmi:1
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
+# msgstr "  --group         - отпечатва групата тагове: group."
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --group         - отпечатва групата на тагове: group."
 
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
+"  --requires      - отпечатва изисквания на тага: всички изисквания "
+"(множество редове)."
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:51
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr ""
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpme:1
+#: ../urpmf:52
 #, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Един от тези пакети е необходим:"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unrequested"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
+"  --requires      - отпечатва изисквания на тага: всички изисквания "
+"(множество редове)."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access rpm file [%s]"
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
+"  --requires      - отпечатва изисквания на тага: всички изисквания "
+"(множество редове)."
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --requires      - отпечатва изисквания на тага: всички изисквания "
 "(множество редове)."
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "невъзможно да се запише конфигурационен файл [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
+"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
+"(множество редове)."
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "създай hdlist синтез файл за посредник  \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - отпечатва полезна информация в \"човешки\" вид.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
+#: ../urpmf:62
+#, fuzzy, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
+"  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "монтиране на %s\n"
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на посредник)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "създай hdlist синтез файл за посредник  \"%s\""
+#: ../urpmi:84 ../urpmq:49
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - автоматично избира пакети за ъпгрейд на системата.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "...копирането се провали"
+#: ../urpmi:86 ../urpmq:51
+#, c-format
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "невъзможен достъпа до hdlist файла на \"%s\", посредника е игнориран"
+#: ../urpmi:88
+#, c-format
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - връща всички сорс пакети преди даунлоуд (само root).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "неизвестен пакет(и)"
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "опит за избор на множество посредници: %s"
+#: ../urpmi:96
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
+#: ../urpmi:98
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "нищо за премахване (ползвай urpmi.addmedia за добавяне на посредник)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "невъзможно да се намери лист файл за \"%s\", посредника е игнориран"
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - показва това помощно съобщение.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#, c-format
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
+#: ../urpmi:115
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - не отпечатва името на тага (по подразбиране ако не е "
-"зададен таг на командата"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
+#: ../urpmi:119
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmi:120
+#, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "  --all           - отпечатва всички тагове."
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Това добре ли е"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+
+#: ../urpmi:128
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "Nothing to remove"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "невъзможност да се запише лист файл за \"%s\""
+#: ../urpmi:131 ../urpmq:84
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "премахване на посредника \"%s\""
+#: ../urpmi:132
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-# msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --group         - отпечатва групата на тагове: group."
+#: ../urpmi:204
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "невъзможност да се запише лист файл за \"%s\""
+msgid "Do nothing"
+msgstr "Не прави нищо"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+#: ../urpmi:213
+#, c-format
+msgid "Yes, really install it"
 msgstr ""
-"  --requires      - отпечатва изисквания на тага: всички изисквания "
-"(множество редове)."
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "опит за избор на несъществуващ посредник \"%s\""
+#: ../urpmi:214 ../urpmi:231
+#, c-format
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - отпечатва описание на тага: description."
+msgid "Install it"
+msgstr "Инсталацията провалена"
+
+#: ../urpmi:239
+#, c-format
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:240
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
+
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
 msgid "Copying failed"
 msgstr "...копирането се провали"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Само superuser-а има правото да инсталира локални пакети"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --all           - отпечатва всички тагове."
+#: ../urpmi:396
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Един от тези пакети е необходим:"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "не е намерен hdlist файл за пасредника \"%s\""
+#: ../urpmi:403
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Какъв е вашият избор? (1-%d) "
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
+msgid "Package installation..."
+msgstr "Инсталиране на пакети..."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "инсталиране %s\n"
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Инициализация..."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "прочети синтез файла [%s]"
+#: ../urpmi:435
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "нищо не е записано в лист файла за \"%s\""
+#: ../urpmi:440 ../urpmi:466
+#, c-format
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматично избиране на добър пакет от избора.\n"
+#: ../urpmi:455
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Инсталацията не може да продължи,защото следните пакети\n"
+"трябва да бъдат премахнати за да бъдат обновени други\n"
+"%s\n"
 
-#: ../urpme:1
+#: ../urpmi:461
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следните пакети трябва да бъдат премахнати,за да могат други да бъдат "
+"обновени:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "...копирането се провали"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"За да се запазят зависимостите,тези пакети ще бъдат инсталирани (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "package %s is not found."
-msgstr "пакетът %s не е намерен."
+msgid "unable to get source packages, aborting"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "премахване на посредника \"%s\""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:541
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr ""
+msgid "Press Enter when ready..."
+msgstr "Натиснете Enter,когато сте готови..."
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "Cancel"
-msgstr "Отказ"
+msgid "Downloading package `%s'..."
+msgstr "Сваляне на пакет `%s'..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:597
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:619
 #, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
-
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "невъзможен достъпа до посредника \"%s\""
-
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "невъзможно създаването на посредника \"%s\"\n"
-
-# msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --group         - отпечатва групата на тагове: group."
+msgid "The following packages have bad signatures"
+msgstr "Тези пакети съдържат %s: %s"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - отпечатва всички тагове.\n"
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "Инсталацията провалена"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "невъзможен достъпа до лист файла на \"%s\", посредника е игнориран"
+msgid "distributing %s"
+msgstr "инсталиране %s\n"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
+msgid "installing %s"
+msgstr "инсталиране %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "прочети синтез файла [%s]"
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Опит за инсталиране без проверка на зависимости? (д/Н) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Опит за инсталиране даже по-силно (--force)? (д/Н) "
+
+#: ../urpmi:772
+#, c-format
+msgid "%d installation transactions failed"
+msgstr "%d инсталационните транзакции не можаха да се осъществят"
+
+#: ../urpmi:780
+#, c-format
+msgid "Installation is possible"
+msgstr "Инсталацията е възможна"
+
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "всичко е инсталирано вече"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "не е намерен hdlist файл за пасредника \"%s\""
+#: ../urpmi.addmedia:38
+#, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
 
 # 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"
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"посредника \"%s\" прави опит да ползва вече използван лист, посредника е "
-"игнориран"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"  --requires      - отпечатва изисквания на тага: всички изисквания "
-"(множество редове)."
-
-#: ../urpmi:1
-#, c-format
-msgid "Do nothing"
-msgstr "Не прави нищо"
+"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
-msgid "mounting %s"
-msgstr "монтиране на %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmi.addmedia:60
+#, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"невъзможна грижата за посредника \"%s\" тъй като лист файла вече се ползва "
-"от друг посредник"
+"  --distrib      - автоматично създаване на всички източници от "
+"инсталационен\n"
+"                   източник.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "невъзможност да се запише лист файл за \"%s\""
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+#: ../urpmi.addmedia:72
+#, c-format
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - отпечатай също групите с имена.\n"
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "посредника \"%s\" не е избран"
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - почистване на хедър кеш директорията.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Само superuser-а има правото да инсталира локални пакети"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - налагане на генерирането на hdlist файлове.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "невъзможно намирането на hdlist файл за \"%s\", посредника е игнориран"
+#: ../urpmi.addmedia:135
+#, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "получаване на огледални източници %s"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
-
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "твърде много точки на монтиране за сменяемия посредник \"%s\""
+msgid "unable to update medium \"%s\"\n"
+msgstr "невъзможно осъвременяването на посредника \"%s\"\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
-"  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "`with' missing for network media\n"
 msgstr ""
 
-# msgstr "  --group         - отпечатва групата тагове: group."
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - отпечатва групата на тагове: group."
-
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
-
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
+msgid "unable to create medium \"%s\"\n"
 msgstr "невъзможно създаването на посредника \"%s\"\n"
 
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
-
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"употреба: urpmi.removemedia [-a] <име> ...\n"
+"където <име> е име на източник за премахване.\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "инсталиране %s\n"
-
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Installation failed"
-msgstr "Инсталацията провалена"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "невъзможно да се запише конфигурационен файл [%s]"
+msgid "  -a             - select all media.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
+#: ../urpmi.removemedia:48
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "нищо за премахване (ползвай urpmi.addmedia за добавяне на посредник)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
-
 # Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:28
 #, fuzzy, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - създаване на ъпдейт посредник.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"usage: urpmi.update [options] <name> ...\n"
+"където <име> е име на посредник за ъпдейт.\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - показва източниците.\n"
+# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - обновява само източници на обновяване.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:41
 #, c-format
-msgid "Ok"
-msgstr "Добре"
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "невалидно hdlist описание \"%s\" в hdlists файла"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Само superuser-а има правото да инсталира локални пакети"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на посредник)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
-
-#: ../urpm.pm:1
+#: ../urpmq:38
 #, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Само superuser-а има правото да инсталира локални пакети"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Това е свободен софтуер и може да бъде разпространяван съгласно GNU GPL"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../_irpm:1
+#: ../urpmq:54
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Автоматична инсталация на пакети ...\n"
-"Вие пожелахте инсталация на пакет %s\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - показва източниците.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, fuzzy, c-format
-msgid "urpmi database locked"
-msgstr "донасяне,rpm база данни,провалено\n"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - показва източниците.\n"
 
-#: ../urpmi:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "невъзможно четенето на rpm файла [%s] от посредника \"%s\""
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - отпечатва всички тагове."
+
+#: ../urpmq:58
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - отпечатва всички тагове."
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
+"  --sources      - връща всички сорс пакети преди даунлоуд (само root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - отпечатва всички тагове.\n"
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1972,45 +1986,64 @@ msgid ""
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    команден ред но без име на пакет)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -f             - отпечатай версия,реализация и архитектура с име.\n"
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - отпечатва полезна информация в \"човешки\" вид.\n"
+
+#: ../urpmq:86
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - отпечатай също групите с имена.\n"
+
+#: ../urpmq:87
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:89
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "липсва kdesu"
+msgid "  -l             - list files in package.\n"
+msgstr "  --list           - отпечатва всички налични пакети.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpmi.update:1
+#: ../urpmq:150
 #, fuzzy, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "  --all           - отпечатва всички тагове."
+
+#: ../urpmq:327
+#, c-format
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"usage: urpmi.update [options] <name> ...\n"
-"където <име> е име на посредник за ъпдейт.\n"
 
-# Another meaning of the word is in the sensе "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "опит за пренебрегване на съществуващия посредник \"%s\", отхвърлен"
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Един от тези пакети е необходим за инсталация на %s:"
+
 #, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "...копирането се провали"
@@ -2052,12 +2085,6 @@ msgstr ""
 #~ msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 #~ msgstr "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 
-#~ msgid ""
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL."
-#~ msgstr ""
-#~ "Това е свободен софтуер и може да бъде разпространяван съгласно GNU GPL"
-
 #~ msgid "usage: urpmf [options] <file>"
 #~ msgstr "начин на използване: urpmf [опции] <файл>"
 
diff --git a/po/br.po b/po/br.po
index 08b00a2d..959526c1 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-01-18 21:28+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -32,1790 +32,1818 @@ msgstr "YyOo"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+msgid "installing %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "fazi en ur zigeriñ rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
+msgid "Is this OK?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr ""
+msgid "Ok"
+msgstr "Ya"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
-msgstr "lemel pakad %s"
+msgid "Cancel"
+msgstr "Nullañ"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
-msgstr "« %s »"
+msgid " (Y/n) "
+msgstr "(Y/n)"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Everything already installed"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:57
 #, c-format
-msgid "What is your choice? (1-%d) "
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "found %d headers in cache"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:202
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:213
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Package installation..."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "%d installation transactions failed"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Sorry, bad choice, try again\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:301
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:309
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Install it"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "Downloading package `%s'..."
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:423
 #, c-format
-msgid "no package named %s"
-msgstr "n'eo ket ur pakad anvet %s"
+msgid "examining parallel handler in file [%s]"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "pakad anavez"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr "(y/N)"
+msgid "unable to open rpmdb"
+msgstr "fazi en ur zigeriñ rpmdb"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "...copying failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr ""
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "\"%s\""
+msgstr "« %s »"
+
+#: ../urpm.pm:783
+#, c-format
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "md5sum mismatch"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "in order to install %s"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  --url          - print tag url: url.\n"
+msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "installing %s\n"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "trying to promote %s"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "unable to remove package %s"
+msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "unmounting %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Missing signature (%s)"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid " (Y/n) "
-msgstr "(Y/n)"
+msgid "no package named %s"
+msgstr "n'eo ket ur pakad anvet %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "removing package %s will break your system"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "do you agree ?"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "...retrieving done"
+msgid "Preparing..."
+msgstr "O prientiñ ..."
+
+#: ../urpm.pm:2752
+#, c-format
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "skipping package %s"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "removing package %s"
+msgstr "lemel pakad %s"
+
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "O prientiñ ..."
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr ""
+msgid "unknown package"
+msgstr "pakad anavez"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
+msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr ""
+msgid " (y/N) "
+msgstr "(y/N)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+msgid "removing %s"
+msgstr "lemel %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:27
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:41
 #, c-format
-msgid "Save file"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to write config file [%s]"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:44
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:49
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:50
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:51
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:52
 #, c-format
-msgid "Checking to remove the following packages"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unrequested"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:55
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:59
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:61
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:62
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:64
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:66
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "Install it"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Copying failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
+msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
-msgstr "Nullañ"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid "  --changelog    - print changelog.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Installation failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "distributing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "installing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "copying hdlists file..."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:772
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:780
 #, c-format
-msgid "Do nothing"
+msgid "Installation is possible"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "Everything already installed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "mounting %s"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:41
 #, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:63
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:38
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:53
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "Ok"
-msgstr "Ya"
+msgid "  --list-media   - list available media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:56
 #, c-format
-msgid "removing %s"
-msgstr "lemel %s"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:58
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:60
 #, c-format
-msgid "in order to keep %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 62319c1b..fe587787 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-01 14:13-0500\n"
 "Last-Translator: Vedran Ljubović <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -39,862 +39,775 @@ msgstr "DdYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automatski napravi sve medije iz instalacionog\n"
-"                   medija.\n"
+"Automatska instalacija paketa...\n"
+"Zahtijevali ste instalaciju paketa %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "ne mogu otvoriti rpmdb"
+msgid "Is this OK?"
+msgstr "Je li ovo u redu?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - ispiši ovu poruku.\n"
+msgid "Ok"
+msgstr "U redu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od sljedećih paketa je potrebno za instalaciju %s:"
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "uklanjam paket %s"
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: naredba nije pronađena\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Nije moguće istovremeno koristi parallel i use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "sve je već instalirano"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - ispiši ovu poruku.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - ispiši tag group: grupa.\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - lista datoteka u paketu.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "koristi proces %d za izvršenje transakcije"
+msgid "unknown protocol defined for %s"
+msgstr "nepoznat protokol je definisan za %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:79
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - ispiši tagove provides: svaki provides.\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nije pronađen download program, podržani su: %s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vaš izbor je? (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu rukovati protokolom: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "pronašao %d zaglavlja u spremniku"
+msgid "syntax error in config file at line %s"
+msgstr "sintaksna greška u konfig datoteci na liniji %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medij \"%s\" pokušava koristiti već korištenu hdlist, ignorišem medij"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"  --proxy-user   - navedi korisnika i šifru potrebne za proxy\n"
-"                   autentifikaciju (format je <user:password>).\n"
+"medij \"%s\" pokušava koristiti već iskorištenu listu, medij je ignorisan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "izvršavam drugi prolaz izračunavanja ovisnosti\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ne mogu se pobrinuti za medij \"%s\" pošto je list datoteka već iskorištena "
+"za drugi medij"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "dobavljam rpm datoteku [%s] ..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu koristiti ime \"%s\" za bezimeni medij pošto je ono već u upotrebi"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - izlistaj dostupne paralelne aliase.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"ne mogu uzeti medij \"%s\" u obzir pošto ne postoji datoteka s listom [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dobavljanje nije uspjelo: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu odrediti medij ove hdlist datoteke [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu istražiti list datoteku za \"%s\", medij je ignorisan"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti hdlist datoteci za \"%s\", ignorišem medij"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binarni OR operator, tačan ako je jedan od izraza tačan.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti list datoteci za \"%s\", ignorišem medij"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokušavam zaobići postojeći medij \"%s\", izbjegavam"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "neispravno ime rpm datoteke [%s]"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuelni medij \"%s\" ne bi trebao imati hdlist ili list datoteku, "
+"ignorišem ga"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuelni medij \"%s\" bi trebao imati čist url, ignorišem medij"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalacionih transakcija nije uspjelo"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu naći hdlist datoteku za \"%s\", ignorišem medij"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ne mogu pristupiti prvom instalacionom mediju (nije pronađena Mandrake/base/"
-"hdlist datoteka)"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne mogu naći list datoteku za \"%s\", ignorišem medij"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Žao mi je, loš izbor, probaj kasnije\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekoherentna datoteka s listom za \"%s\", medij je ignorisan"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
-msgstr "Izaberi lokaciju za snimanje"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu istražiti list datoteku za \"%s\", medij je ignorisan"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - ispiši tag summary: sažetak.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sljedeći paketi sadrže %s: %s"
+msgid "taking removable device as \"%s\""
+msgstr "uzimam izmjenjivi uređaj kao \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Install it"
-msgstr "Instaliraj"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - koristi X interfejs.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jedan od sljedećih paketa je potreban:"
+msgid "unable to write config file [%s]"
+msgstr "nisam u mogućnosti da zapišem konf. datoteku [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedeće pakete (%d MB)"
+msgid "write config file [%s]"
+msgstr "zapiši konf. datoteku [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - izaberi najbolji interfejs ovisno o okruženju:\n"
-"                   X ili tekstualni.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Nije moguće istovremeno koristi parallel i use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Downloadujem paket `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne mogu obraditi \"%s\" u datoteci [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Šta mogu uraditi sa binarnim rpm datotekama koristeći --install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "ispitujem paralelni držač u datoteci [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatski izaberi pakete za unaprijeđenje sistema.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "pronašao paralelni držač za čvorove: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "nema paketa pod imenom %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "koristi pridruženi medij za paralelni mod: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - izaberi sve pogotke na komandnoj liniji.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "ne mogu koristiti paralelnu opciju \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Instalacija nije uspjela, neke od datoteka nedostaju:\n"
-"%s\n"
-"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
+"--synthesis se ne može koristiti zajedno sa --media, --excludemedia, --"
+"sortmedia, --update or --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"koristi: urpmi.removemedia [-a] <ime> ...\n"
-"gdje je <ime> naziv medija za uklanjanje.\n"
+msgid "examining synthesis file [%s]"
+msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
-"uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' nedostaje za mrežni medij\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuelni medij \"%s\" nije lokalan, ignorišem ga"
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista datoteka u paketu.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem u čitanju hdlist ili synthesis datoteke za medij \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "nepoznat paket"
+msgid "performing second pass to compute dependencies\n"
+msgstr "izvršavam drugi prolaz izračunavanja ovisnosti\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalacija nije moguća"
+msgid "skipping package %s"
+msgstr "preskačem paket %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "instaliraću umjesto unaprjeđenja paketa %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"ne mogu uzeti medij \"%s\" u obzir pošto ne postoji datoteka s listom [%s]"
+msgid "unable to open rpmdb"
+msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" već postoji"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ne mogu updatovati \"cooker\" verziju distribucije\n"
+msgid "virtual medium need to be local"
+msgstr "virtuelni medij mora biti lokalan"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - rječiti mod.\n"
+msgid "added medium %s"
+msgstr "dodao medij %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicijaliziram..."
+msgid "unable to access first installation medium"
+msgstr "ne mogu pristupiti prvom instalacionom mediju"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista dostupnih paketa.\n"
+msgid "copying hdlists file..."
+msgstr "kopiram hdlist datoteku..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - ispiši sve tagove.\n"
+msgid "...copying failed"
+msgstr "...kopiranje nije uspjelo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
+msgid "...copying done"
+msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuelni medij \"%s\" ne bi trebao imati hdlist ili list datoteku, "
-"ignorišem ga"
+"ne mogu pristupiti prvom instalacionom mediju (nije pronađena Mandrake/base/"
+"hdlist datoteka)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "izračunavam md5sumu kopirane hdlist (ili synthesis) datoteke"
+msgid "retrieving hdlists file..."
+msgstr "skidam hdlists datoteku..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - isključi puteve razdvojene zarezom.\n"
+msgid "...retrieving done"
+msgstr "...download završen"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada budete spremni..."
+msgid "...retrieving failed: %s"
+msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "neispravan hdlist opis \"%s\" u hdlist datoteci"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - podijeli u više manjih transakcija ako će navedeni\n"
-"                   paketi biti instalirani ili unaprijeđeni,\n"
-"                   podrazumijeva se %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "ne mogu izabrati nepostojeći medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem u čitanju hdlist ili synthesis datoteke za medij \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "biram više medija: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - koristi wget za download datoteka.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - izlistaj dostupne nodove kod korištenja --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "pravim hdlist [%s]"
+"ne mogu pristupiti mediju \"%s\",\n"
+"ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
+"medija."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
-"                   pakete koji vode uklanjanju.\n"
+"virtuelni medij \"%s\" bi trebao imati ispravan hdlist ili synthesis, "
+"ignorišem ga"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "ispitujem MD5SUM datoteku"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: naredba nije pronađena\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "izračunavam md5sum postojećeg izvornog hdlista (ili synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "ne mogu registrovati rpm datoteku"
+msgid "examining MD5SUM file"
+msgstr "ispitujem MD5SUM datoteku"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - dozvoli pitanje korisniku da instalira pakete\n"
-"                   bez provjere ovisnosti.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopiram izvorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu rukovati protokolom: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "skidam hdlists datoteku..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "izračunavam md5sumu kopirane hdlist (ili synthesis) datoteke"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Da, stvarno instaliraj"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "dodao medij %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - čuvaj neiskorištene rpm-ove u spremniku.\n"
+msgid "reading rpm files from [%s]"
+msgstr "čitam rpm datoteke iz [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
-"unaprijedi=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne mogu čitati rpm datoteke iz [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum ne odgovara"
+msgid "no rpm files found from [%s]"
+msgstr "nisam našao rpm datoteke sa [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaksna greška u konfig datoteci na liniji %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - koristi navedeni HTTP proxy, broj porta se pretpostavlja\n"
-"                   da je 1080 (format je <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "da bih instalirao %s"
+msgid "md5sum mismatch"
+msgstr "md5sum ne odgovara"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relocirao %s unosa u depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "skidanje hdlist (ili synthesis) datoteke nije uspjelo"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "datoteka [%s] se već koristi na istom mediju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "instaliraću umjesto unaprjeđenja paketa %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "skidam mirror-e na %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - ispiši tag url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "ispisujem list datoteku za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nepoznat protokol je definisan za %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "ništa nije zapisano u list datoteku za \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ispiši verziju i izdanje sa imenom.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "istražujem pubkey datoteku za \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - ispiši tag obsoletes: sve što je prevaziđeno.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" već postoji"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "dobavljam zaglavlja sa medija \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"stavka za update nedostaje\n"
-"(jedan od %s)\n"
+msgid "building hdlist [%s]"
+msgstr "pravim hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "pokušavam promovirati %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ne mogu ukloniti paket %s"
+msgid "found %d headers in cache"
+msgstr "pronašao %d zaglavlja u spremniku"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d prevaziđenih zaglavlja iz spremnika"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"stavka za brisanje nedostaje\n"
-"(jedan od %s)\n"
+msgid "mounting %s"
+msgstr "montiram %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - izaberi sve medije.\n"
+msgid "unmounting %s"
+msgstr "demontiram %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Nedostaje potpis (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "relocirao %s unosa u depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne mogu čitati rpm datoteke iz [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "nijedna stavka nije relocirana u depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuirani urpmi preko mašina sa aliasom.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - osvježi samo medije za update.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (D/n) "
+msgid "unable to register rpm file"
+msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - ispiši tag group: grupa.\n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"medij \"%s\" pokušava koristiti već iskorištenu listu, medij je ignorisan"
+msgid "no package named %s"
+msgstr "nema paketa pod imenom %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "neispravan ulaz: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Sljedeći paketi sadrže %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - izlistaj dostupne medije.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne mogu ispravno obraditi [%s] na vrijednosti \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Neki od traženih paketa se ne mogu instalirati:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
+"medij \"%s\" koristi neispravnu list datoteku:\n"
+"  mirror je vjerovatno zastario, pokušavam koristiti alternativnu metodu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nijedna stavka nije relocirana u depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medij \"%s\" ne određuje lokaciju rpm datoteka"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instaliraj samo izvorne pakete (bez binarnih).\n"
+msgid "package %s is not found."
+msgstr "paket %s nije pronađen"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - koristi curl za download datoteka.\n"
+msgid "urpmi database locked"
+msgstr "urpmi baza podataka je zaključana"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "slažete li se ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekoherentna datoteka s listom za \"%s\", medij je ignorisan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "nekoherentan medij \"%s\" je označen kao izmjenljiv, mada nije ustvari"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...download završen"
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "neispravan ulaz: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "preskačem paket %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "dobavljam rpm datoteke za medij \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Neispravan potpis (%s)"
+msgid "Preparing..."
+msgstr "Pripremam..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
+msgid "using process %d for executing transaction"
+msgstr "koristi proces %d za izvršenje transakcije"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne mogu ispravno obraditi [%s] na vrijednosti \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu odrediti medij ove hdlist datoteke [%s]"
+"napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
+"unaprijedi=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
+msgid "unable to create transaction"
+msgstr "ne mogu napraviti transakciju"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "medij \"%s\" pokušava koristiti već korištenu hdlist, ignorišem medij"
+msgid "removing package %s"
+msgstr "uklanjam paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "zbog konflikta sa %s"
+msgid "unable to remove package %s"
+msgstr "ne mogu ukloniti paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d prevaziđenih zaglavlja iz spremnika"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu update-irati medij \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "ne mogu instalirati paket %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
+msgid "due to missing %s"
+msgstr "zbog nedostajućeg %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuelni medij \"%s\" nije lokalan, ignorišem ga"
+msgid "due to unsatisfied %s"
+msgstr "zbog nezadovoljenih %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - lista datoteka u paketu.\n"
+msgid "trying to promote %s"
+msgstr "pokušavam promovirati %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristeći različit izmjenjivi uređaj [%s] za \"%s\""
+msgid "in order to keep %s"
+msgstr "kako bi zadržao %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ne pokušavaj pronaći synthesis ili\n"
-"                   hdlist datoteku.\n"
+msgid "in order to install %s"
+msgstr "da bih instalirao %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne pretražuj 'provides' pri traženju paketa.\n"
+msgid "due to conflicts with %s"
+msgstr "zbog konflikta sa %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
+msgid "unrequested"
+msgstr "nije tražen"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - podesi urpmi u letu iz distrib stabla.\n"
-"                   Ovo omogućuje ispitivanje distribucije.\n"
+msgid "Invalid signature (%s)"
+msgstr "Neispravan potpis (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Neispravan ID ključa (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - ukloni rpm iz spremnika prije svega ostalog.\n"
+msgid "Missing signature (%s)"
+msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ne mogu koristiti ime \"%s\" za bezimeni medij pošto je ono već u upotrebi"
+msgid "bad proxy declaration on command line\n"
+msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - ispiši tag conflicts: svi konflikti.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuelni medij \"%s\" bi trebao imati ispravan hdlist ili synthesis, "
-"ignorišem ga"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Žao mi je, loš izbor, probaj kasnije\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -910,1083 +823,1216 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - ispiši ovu poruku.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatski izaberi pakete u izborima.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativni_put>]\n"
-"gdje je <url> jedan od\n"
-"       file://<put>\n"
-"       ftp://<korisničko_ime>:<šifra>@<host>/<put> with <relativnim nazivom "
-"datoteke hdlist>\n"
-"       ftp://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
-"       http://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
-"       removable://<put>\n"
-"\n"
-"a [opcije] su\n"
+"  --test         - provjeri da li se instalacija može ispravno izvršiti.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopiram izvorni hdlist (ili synthesis) za \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - prisili pozivanje čak i ako neki paketi ne postoje.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiranje završeno"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuirani urpmi preko mašina sa aliasom.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu koristiti paralelnu opciju \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"medij \"%s\" koristi neispravnu list datoteku:\n"
-"  mirror je vjerovatno zastario, pokušavam koristiti alternativnu metodu"
+"  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
+"                   chroot de-instalacije uz korištenje --root opcije.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ne mogu pristupiti prvom instalacionom mediju"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - rječiti mod.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuelni medij mora biti lokalan"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "greška pri registrovanju lokalnih paketa"
+msgid "unknown packages"
+msgstr "nepoznati paket"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - ograniči brzinu downloada.\n"
+msgid "unknown package"
+msgstr "nepoznat paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
+msgid "removing package %s will break your system"
+msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "skidanje hdlist (ili synthesis) datoteke nije uspjelo"
+msgid "Nothing to remove"
+msgstr "Nema ništa za uklanjanje"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nisam našao rpm datoteke sa [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Provjeravam uklanjanje sljedećih paketa"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ništa nije zapisano u list datoteku za \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedeće pakete (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sljedeći paketi imaju neispravne potpise"
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "izračunavam md5sum postojećeg izvornog hdlista (ili synthesis)"
+msgid "removing %s"
+msgstr "uklanjam %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kompletan izlaz sa paketom za uklanjanje.\n"
+msgid "Removing failed"
+msgstr "Uklanjanje nije uspjelo"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verzija %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "ne mogu instalirati paket %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo navedene medije, razdvojene zarezom.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - dozvoli pitanje korisniku da instalira pakete bez\n"
-"                   provjere ovisnosti i integriteta.\n"
+"  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
+"zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Snimi datoteku"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi navedeni synthesis umjesto urpmi baze.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - rječiti mod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nisam u mogućnosti da zapišem konf. datoteku [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - ne ispisuj ime taga (podrazumijeva se ako tag nije zadan\n"
+"                   na komandnoj liniji, nekompativilno sa interaktivnim "
+"modom).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ne ispisuj identične linije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Neispravan ID ključa (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - ispiši sve tagove.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - prisili pozivanje čak i ako neki paketi ne postoje.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - ispiši tag group: grupa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - ispiši tag size: veličina.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - ispiši tag epoch: epoha.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - ispiši tag summary: sažetak.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - prinudi update gpg ključa.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - ispiši tag description: opis.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativni put do datoteke hdlist> nedostaje\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - ispiši tag sourcerpm: izvorni rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Provjeravam uklanjanje sljedećih paketa"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - ispiši tag packager: autor paketa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "nije tražen"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - ispiši tag buildhost: računar na kojem je kompajliran.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu pristupiti rpm datoteci [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - ispiši tag url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - ispiši tag files: sve datoteke.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - ispiši tagove provides: svaki provides.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ne mogu obraditi \"%s\" u datoteci [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - ispiši tag requires: svi zahtjevi.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Želite li nastaviti instalaciju ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - ispiši tag files: sve datoteke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - ispiši tag conflicts: svi konflikti.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - ispiši tag obsoletes: sve što je prevaziđeno.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
-"                   chroot instalacije uz korištenje --root opcije.\n"
+"  --env          - koristi navedenu okolinu (tipično izvještaj\n"
+"                   o bugu).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - ispiši korisne informacije u čitljivom obliku.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - koristi navedenu verziju distribucije, za "
-"podrazumijevanu\n"
-"                   vrijednost se uzima verzija koju daje instalirani\n"
-"                   paket mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - koristi navedeni url za listu mirrora, podrazumijeva se\n"
-"                   %s\n"
+"  -a             - binarni I operator, tačan ako su oba izraza tačna.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
-"                   chroot de-instalacije uz korištenje --root opcije.\n"
+"  -o             - binarni OR operator, tačan ako je jedan od izraza tačan.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unarno NE, tačno ako je izraz netačan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - lijeva zagrada, otvara grupu izraza.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - desna zagrada zatvara grupu izraza.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
-"prijavu buga ili ga obrišite"
+"callback je :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "demontiram %s"
+msgid "using specific environment on %s\n"
+msgstr "koristim navedenu okolinu na %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% zaveršeno, brzina = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzija %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "restartujem urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ispitujem synthesis datoteku [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatski izaberi pakete za unaprijeđenje sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nikad ne pitaj za deinstalaciju paketa, prekini "
+"instalaciju.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiranje nije uspjelo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - čuvaj postojeće pakete ako je moguće, odbaci tražene\n"
+"                   pakete koji vode uklanjanju.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti hdlist datoteci za \"%s\", ignorišem medij"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - podijeli u više manjih transakcija ako će navedeni\n"
+"                   paketi biti instalirani ili unaprijeđeni,\n"
+"                   podrazumijeva se %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi mod.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - mala dužina transakcije, podrazumijeva se %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - rječiti mod.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - nametni fuzzy pretragu (isto što i -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - daj sve source pakete prije downloada (samo root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - sljedeći paket je source paket (isto što i -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - izdvoji zaglavlja za izlistane pakete iz urpmi baze\n"
-"                   na stdout (samo root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instaliraj samo izvorne pakete (bez binarnih).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "nepoznati paket"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - ukloni rpm iz spremnika prije svega ostalog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "biram više medija: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - čuvaj neiskorištene rpm-ove u spremniku.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - dozvoli pitanje korisniku da instalira pakete\n"
+"                   bez provjere ovisnosti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "datoteka [%s] se već koristi na istom mediju \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - dozvoli pitanje korisniku da instalira pakete bez\n"
+"                   provjere ovisnosti i integriteta.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ništa za uklanjanje (koristite urpmi.addmedia da dodate medij)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - podesi urpmi u letu iz distrib stabla, korisno za\n"
+"                   chroot instalacije uz korištenje --root opcije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne mogu naći list datoteku za \"%s\", ignorišem medij"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za download datoteka.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - ispiši ovu poruku.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za download datoteka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "pronašao paralelni držač za čvorove: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - ograniči brzinu downloada.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"callback je :\n"
-"%s\n"
+"  --resume       - nastavi prijenos djelomično prenesenih datoteka\n"
+"                   (--no-resume isključuje, što je i podrazumijevano).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - obrnuta pretraga za ono što zahtijeva paket.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - koristi navedeni HTTP proxy, broj porta se pretpostavlja\n"
+"                   da je 1080 (format je <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf verzija %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba:\n"
+"  --proxy-user   - navedi korisnika i šifru potrebne za proxy\n"
+"                   autentifikaciju (format je <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - ne ispisuj ime taga (podrazumijeva se ako tag nije zadan\n"
-"                   na komandnoj liniji, nekompativilno sa interaktivnim "
-"modom).\n"
+"  --bug          - ispiši izvještaj o bugu u direktorij naveden u\n"
+"                   idućem argumentu.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ne ispisuj identične linije.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - koristi X interfejs.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis se ne može koristiti zajedno sa --media, --excludemedia, --"
-"sortmedia, --update or --parallel"
+"  --best-output  - izaberi najbolji interfejs ovisno o okruženju:\n"
+"                   X ili tekstualni.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - koristi navedenu arhitekturu, podrazumijeva se "
-"arhitektura\n"
-"                   instaliranog mandrake-release paketa.\n"
+"  --verify-rpm   - provjeri potpis rpm-a prije instalacije\n"
+"                   (--no-verify-rpm isključuje, normalno je uključeno).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Je li ovo u redu?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - isključi puteve razdvojene zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - isključi docs datoteke.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi navedeni synthesis umjesto urpmi baze.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - izaberi sve pogotke na komandnoj liniji.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ispitujem paralelni držač u datoteci [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - uključi pretragu 'provides' taga radi nalaženja paketa.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nema ništa za uklanjanje"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne pretražuj 'provides' pri traženju paketa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - nametni fuzzy pretragu (isto što i --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "dobavljam zaglavlja sa medija \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - sljedeći paket je source paket (isto što i --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - proširi upit na ovisnosti paketa.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - ispiši izvještaj o bugu u direktorij naveden u\n"
-"                   idućem argumentu.\n"
+"  imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medij \"%s\" ne određuje lokaciju rpm datoteka"
+msgid "Choose location to save file"
+msgstr "Izaberi lokaciju za snimanje"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - ispiši tag sourcerpm: izvorni rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Šta mogu uraditi sa binarnim rpm datotekama koristeći --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne mogu zapisati list datoteku za \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Izabrali ste paket sa izvornim kodom:\n"
+"\n"
+"%s\n"
+"\n"
+"Vjerovatno ga ne želite instalirati na vaš računar (što vam\n"
+"omogućuje da pravite izmjene u izvornom kodu prije kompajliranja).\n"
+"\n"
+"Šta želite uraditi?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - ispiši tag requires: svi zahtjevi.\n"
+msgid "Do nothing"
+msgstr "Ne radi ništa"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "ne mogu izabrati nepostojeći medij \"%s\""
+msgid "Yes, really install it"
+msgstr "Da, stvarno instaliraj"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - ispiši tag description: opis.\n"
+msgid "Save file"
+msgstr "Snimi datoteku"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiranje nije uspjelo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Upravo ćete instalirati sljedeće softverske pakete na vaš računar:\n"
+"\n"
+"%s\n"
+"\n"
+"Možda želite da ih samo snimite. Šta je vaš izbor?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+msgid "Install it"
+msgstr "Instaliraj"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes se može koristiti samo sa --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
+"prijavu buga ili ga obrišite"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - sljedeći paket je source paket (isto što i --src).\n"
+msgid "Copying failed"
+msgstr "Kopiranje nije uspjelo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "instaliram %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo administrator (root) može instalirati pakete"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "čitam rpm datoteke iz [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiram opisnu datoteku za \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Vaš izbor je? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatski izaberi pakete u izborima.\n"
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Uklanjanje nije uspjelo"
+msgid "Initializing..."
+msgstr "Inicijaliziram..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - napravi virtuelne medije koji su uvijek osvježeni,\n"
-"                   dozvoljen je samo protokol file:// .\n"
+"Neki od traženih paketa se ne mogu instalirati:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "paket %s nije pronađen"
+msgid "do you agree ?"
+msgstr "slažete li se ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
+"uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete (%d MB)"
+
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Morate biti root da biste instalirali sljedeće ovisnosti:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - sljedeći paket je source paket (isto što i -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - koristi navedenu okolinu (tipično izvještaj\n"
-"                   o bugu).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
-"zarezom.\n"
+msgid "Press Enter when ready..."
+msgstr "Pritisnite Enter kada budete spremni..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "Downloadujem paket `%s'..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu napraviti medij \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% od %s završeno, preostalo = %s, brzina = %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - ispiši tag packager: autor paketa.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% zaveršeno, brzina = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - ispiši konfiguraciju u obliku argumenata za urpmi."
-"addmedia.\n"
+msgid "The following packages have bad signatures"
+msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpmi:1
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Želite li nastaviti instalaciju ?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Morate biti root da biste instalirali sljedeće ovisnosti:\n"
+"Instalacija nije uspjela, neke od datoteka nedostaju:\n"
 "%s\n"
+"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - ispiši dnevnik izmjena.\n"
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti list datoteci za \"%s\", ignorišem medij"
+msgid "distributing %s"
+msgstr "distribuiram %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - desna zagrada zatvara grupu izraza.\n"
+msgid "installing %s"
+msgstr "instaliram %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nije pronađen download program, podržani su: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "ispitujem hdlist datoteku [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopiram hdlist datoteku..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "ispisujem list datoteku za medij \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d instalacionih transakcija nije uspjelo"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuelni medij \"%s\" bi trebao imati čist url, ignorišem medij"
+msgid "Installation is possible"
+msgstr "Instalacija nije moguća"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartujem urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"  --buildhost    - ispiši tag buildhost: računar na kojem je kompajliran.\n"
+"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativni_put>]\n"
+"gdje je <url> jedan od\n"
+"       file://<put>\n"
+"       ftp://<korisničko_ime>:<šifra>@<host>/<put> with <relativnim nazivom "
+"datoteke hdlist>\n"
+"       ftp://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
+"       http://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
+"       removable://<put>\n"
+"\n"
+"a [opcije] su\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ništa"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - napravi medij za unaprjeđenje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "koristi pridruženi medij za paralelni mod: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "montiram %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"ne mogu se pobrinuti za medij \"%s\" pošto je list datoteka već iskorištena "
-"za drugi medij"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ne mogu dobiti izvorne pakete, prekidam"
+"  --no-probe     - ne pokušavaj pronaći synthesis ili\n"
+"                   hdlist datoteku.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije iz instalacionog\n"
+"                   medija.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% od %s završeno, preostalo = %s, brzina = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automatski napravi medij za XXX dio distribucije,\n"
+"                   XXX može biti main, contrib, updates ili bilo šta\n"
+"                   drugo što konfigurišete ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - koristi navedeni url za listu mirrora, podrazumijeva se\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - koristi navedenu verziju distribucije, za "
+"podrazumijevanu\n"
+"                   vrijednost se uzima verzija koju daje instalirani\n"
+"                   paket mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nikad ne pitaj za deinstalaciju paketa, prekini "
-"instalaciju.\n"
+"  --arch         - koristi navedenu arhitekturu, podrazumijeva se "
+"arhitektura\n"
+"                   instaliranog mandrake-release paketa.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq verzija %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba:\n"
+"  --virtual      - napravi virtuelne medije koji su uvijek osvježeni,\n"
+"                   dozvoljen je samo protokol file:// .\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ispiši grupe sa imenom.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - očisti direktorij sa spremnikom zaglavlja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo administrator (root) može instalirati pakete"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ne mogu updatovati \"cooker\" verziju distribucije\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim navedenu okolinu na %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "skidam mirror-e na %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu naći hdlist datoteku za \"%s\", ignorišem medij"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - mala dužina transakcije, podrazumijeva se %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu update-irati medij \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - lijeva zagrada, otvara grupu izraza.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativni put do datoteke hdlist> nedostaje\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše tačaka montiranja za izmjenjivi medij \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' nedostaje za mrežni medij\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binarni I operator, tačan ako su oba izraza tačna.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu napraviti medij \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"ne mogu pristupiti mediju \"%s\",\n"
-"ovo se moglo desiti ako ste ručno montirali direktorij prilikom pravljenja "
-"medija."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - ispiši tag group: grupa.\n"
+"koristi: urpmi.removemedia [-a] <ime> ...\n"
+"gdje je <ime> naziv medija za uklanjanje.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo navedene medije, razdvojene zarezom.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - izaberi sve medije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "ne mogu napraviti transakciju"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "dobavljam rpm datoteke za medij \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ništa za uklanjanje (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Izabrali ste paket sa izvornim kodom:\n"
-"\n"
-"%s\n"
-"\n"
-"Vjerovatno ga ne želite instalirati na vaš računar (što vam\n"
-"omogućuje da pravite izmjene u izvornom kodu prije kompajliranja).\n"
-"\n"
-"Šta želite uraditi?"
+"stavka za brisanje nedostaje\n"
+"(jedan od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuiram %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"upotreba: urpmi.update [opcije] <ime> ...\n"
+"gdje je <ime> naziv medija za unaprjeđenje.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - osvježi samo medije za update.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapiši konf. datoteku [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - prinudi update gpg ključa.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - izaberi ne-izmjenjive medije.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - ispiši tag epoch: epoha.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - provjeri potpis rpm-a prije instalacije\n"
-"                   (--no-verify-rpm isključuje, normalno je uključeno).\n"
+"stavka za update nedostaje\n"
+"(jedan od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verzija %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista dostupnih paketa.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za unaprjeđenje.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - izlistaj dostupne medije.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - izlistaj dostupne medije i njihove URLove.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - nametni fuzzy pretragu (isto što i --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - ispiši konfiguraciju u obliku argumenata za urpmi."
+"addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "U redu"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - izlistaj dostupne nodove kod korištenja --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "neispravan hdlist opis \"%s\" u hdlist datoteci"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - izlistaj dostupne paralelne aliase.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "uklanjam %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - izdvoji zaglavlja za izlistane pakete iz urpmi baze\n"
+"                   na stdout (samo root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automatski napravi medij za XXX dio distribucije,\n"
-"                   XXX može biti main, contrib, updates ili bilo šta\n"
-"                   drugo što konfigurišete ;-)\n"
+"  --sources      - daj sve source pakete prije downloada (samo root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - ispiši tag size: veličina.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - podesi urpmi u letu iz distrib stabla.\n"
+"                   Ovo omogućuje ispitivanje distribucije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "kako bi zadržao %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - ispiši dnevnik izmjena.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "zbog nezadovoljenih %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - proširi upit na ovisnosti paketa.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatska instalacija paketa...\n"
-"Zahtijevali ste instalaciju paketa %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi baza podataka je zaključana"
+"  -u             - ukloni paket ako je već instalirana novija verzija.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - nastavi prijenos djelomično prenesenih datoteka\n"
-"                   (--no-resume isključuje, što je i podrazumijevano).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kompletan izlaz sa paketom za uklanjanje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "istražujem pubkey datoteku za \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - obrnuta pretraga za ono što zahtijeva paket.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - ispiši korisne informacije u čitljivom obliku.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam izmjenjivi uređaj kao \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ispiši grupe sa imenom.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Upravo ćete instalirati sljedeće softverske pakete na vaš računar:\n"
-"\n"
-"%s\n"
-"\n"
-"Možda želite da ih samo snimite. Šta je vaš izbor?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ispiši verziju i izdanje sa imenom.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - nametni fuzzy pretragu (isto što i -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista datoteka u paketu.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - ukloni paket ako je već instalirana novija verzija.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes se može koristiti samo sa --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "zbog nedostajućeg %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"upotreba: urpmi.update [opcije] <ime> ...\n"
-"gdje je <ime> naziv medija za unaprjeđenje.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokušavam zaobići postojeći medij \"%s\", izbjegavam"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Jedan od sljedećih paketa je potrebno za instalaciju %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - provjeri da li se instalacija može ispravno izvršiti.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq verzija %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-"
+#~ "a.\n"
+#~ "\n"
+#~ "upotreba:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Nepoznat webfetch `%s' !!!\n"
diff --git a/po/ca.po b/po/ca.po
index da5db8c5..aef3998d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 20:45+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -37,888 +37,785 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "s'està instal·lant %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automàticament crea tots les fonts des d'una font\n"
-"                   d'instal·lació.\n"
+"Instal·lació automàtica dels paquets...\n"
+"Heu demanat la instal·lació del paquet %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "no s'ha pogut obrir rpmdb"
+msgid "Is this OK?"
+msgstr "És correcte?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
+msgid "Ok"
+msgstr "D'acord"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Un dels paquets següents necessita ser instal·lat %s:"
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "s'està eliminant el paquet %s"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: no s'ha trobat l'ordre\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "No es pot usar el mode paral·lel amb el mode use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"sintaxi: %s [opcions]\n"
+"on [opcions] pot ser\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Ja està tot instal·lat"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - mostra aquest missatge d'ajuda.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - buida el directori de memòria cau de capçaleres.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - restringeix els resultats al grup donat.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "s'està usant el procés %d per executar la transacció"
+msgid "                    defaults is %s.\n"
+msgstr "                    el valor per defecte és %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
+msgid "unknown protocol defined for %s"
+msgstr "el protocol definit per a %s és desconegut"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Quina és la vostra elecció? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
+"no s'ha trobat cap programa per baixar coses de la xarxa, els programes "
+"suportats són: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "s'han trobat %d capçaleres a la memòria cau"
+msgid "unable to handle protocol: %s"
+msgstr "incapaç de gestionar el protocol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "hi ha múltiples paquets amb el mateix nom de fitxer rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "error de sintaxi en fitxer de configuració a la línia %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especifica l'usuari i la contrasenya per a utilitzar la "
-"autenticació\n"
-"                   del proxy (el format és <usuari:contrasenya>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "la font \"%s\" ha provat d'utilitzar un hdlist en ús, font ignorada"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "s'està fent segona passada per a computar dependències\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"la font \"%s\" ha provat d'utilitzar un fitxer list en ús, font ignorada"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "s'està recuperant els fitxer rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"no s'ha pogut tenir cura de la font \"%s\" perquè el fitxer list és "
+"utilitzat per una altra font"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - llista els àlias paral·lels disponibles.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"no es pot utilitzar el nom \"%s\" per a la font nom perquè ja està en ús"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ha fallat la recuperació: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"no es pot tenir en compte la font \"%s\" perquè no existeix cap fitxer list "
+"[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"no s'ha estat capaç d'inspeccionar el fitxer list per \"%s\", s'ignora la "
-"font"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no es pot determinar la font d'aquest fitxer hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operador binari OR, cert si una expressió és certa.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no es pot accedir al fitxer hdlist de \"%s\", font ignorada"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instal·lació de paquets..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora la font"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "el nom del fitxer rpm és incorrecte [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "provant de passar per alt la font existent \"%s\", evitant"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
+"la font virtual \"%s\" no hauria de tenir definit cap hdlist ni fitxer list, "
+"font ignorada"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "han fallat %d transaccions d'instal·lació"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
-"Mandrake/base/hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no es pot trobar el fitxer hdlist per a \"%s\", s'ignora la font"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Elecció incorrecta, torneu-ho a provar\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat la font"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Escolliu la ubicació un desar el fitxer"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fitxer list incoherent per \"%s\", s'ha ignorat la font"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - mostra l'etiqueta summary: resum.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"no s'ha estat capaç d'inspeccionar el fitxer list per \"%s\", s'ignora la "
+"font"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Els paquets següents contenen %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "massa punts de muntatge per la font extraïble \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instal·la'l"
+msgid "taking removable device as \"%s\""
+msgstr "agafant dispositiu extraïble com a \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utilitza l'interfície X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Cal un dels paquets següents:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Per a complir les dependències, s'eliminaran els següents paquets (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - escull la millor interfície d'acord amb l'entorn:\n"
-"                   el mode X o de text.\n"
+msgid "write config file [%s]"
+msgstr "escriure fitxer de configuració [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "S'està descarregant el paquet `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "No es pot usar el mode paral·lel amb el mode use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - selecciona automàticament els paquets per actualitzar el "
-"sistema.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "s'està examinant manegador paral·lel en fitxer [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "no hi cap paquet anomenat %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "s'ha trobat un manegador paral·lel per als nodes: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - selecciona totes les coincidències en la línia d'ordres.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "s'està utilitzant la font associada al mode paral·lel : %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"La instal·lació ha fallat, no falten alguns fitxers.\n"
-"\n"
-"%s\n"
-"Potser voleu actualitzar la base de dades urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "no s'ha pogut usar l'opció de paral·lel \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
-"on <nom> és el nom de la font a eliminar.\n"
+"--synthesis no es pot usar amb --media, --excludemedia, --sortmedia, --"
+"update ni --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"La instal·lació no pot continuar ja que els següents paquets\n"
-"s'han d'eliminar per poder actualitzar uns altres:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "s'està examinant el fitxer de síntesi [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "falta el `with' per a les fonts de xarxa\n"
+msgid "examining hdlist file [%s]"
+msgstr "s'està examinant el fitxer hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - llista els fitxers del paquet.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "la font virtual \"%s\" no és local, font ignorada"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "paquet desconegut"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr ""
+"s'ha trobat un problema llegint el fitxer hdlist o de síntesi de la font \"%s"
+"\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "La instal·lació és possible"
+msgid "performing second pass to compute dependencies\n"
+msgstr "s'està fent segona passada per a computar dependències\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "s'està saltant el paquet %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Per complir les dependències, s'instal·laran els %d paquets següents (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "instal·laria en comptes d'actualitzar el paquet %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"no es pot tenir en compte la font \"%s\" perquè no existeix cap fitxer list "
-"[%s]"
+msgid "unable to open rpmdb"
+msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "medium \"%s\" already exists"
+msgstr "la font \"%s\" ja existeix"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "no es poden afegir actualitzacions d'una distribució cooker\n"
+msgid "virtual medium need to be local"
+msgstr "La font virtual ha de ser local"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detallat.\n"
+msgid "added medium %s"
+msgstr "s'ha afegit la font %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "S'està inicialitzant..."
+msgid "unable to access first installation medium"
+msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - llista els paquets disponibles.\n"
+msgid "copying hdlists file..."
+msgstr "s'està copiant el fitxer hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - mostra totes les etiquetes.\n"
+msgid "...copying failed"
+msgstr "..la còpia ha fallat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"font incoherent \"%s\", marcada com a extraïble però no és així realment"
+msgid "...copying done"
+msgstr "...còpia feta"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"la font virtual \"%s\" no hauria de tenir definit cap hdlist ni fitxer list, "
-"font ignorada"
+"no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "s'està computant el md5sum de la font hdlist (o síntesi)"
+msgid "retrieving hdlists file..."
+msgstr "s'està recuperant el fitxer hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...recuperació feta"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Premeu Intro quan estigui fet..."
+msgid "...retrieving failed: %s"
+msgstr "...ha fallat la recuperació: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcions desconegudes '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descripció hdlist incorrecta \"%s\" en el fitxer hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr ""
-"s'ha trobat un problema llegint el fitxer hdlist o de síntesi de la font \"%s"
-"\""
+msgid "selecting multiple media: %s"
+msgstr "s'està seleccionant múltiples fonts: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget per a recuperar fitxers llunyans.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - permet la cerca en allò que proporcionen els paquets per "
-"a trobar-los.\n"
+msgid "removing medium \"%s\""
+msgstr "s'està esborrant la font \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "s'està construint l'hdlist [%s]"
+"no s'ha pogut accedir a la font \"%s\",\n"
+"pot passar si havies muntat manualment el directori al crear la font."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - manté els paquets existents si és possible, rebutja els "
-"paquets demanats\n"
-"                   que porten a la eliminació d'altres paquets.\n"
+"la font virtual \"%s\" hauria de tenir una font hdlist o synthesis vàlida, "
+"s'ignora la font"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "s'està examinant el fitxer MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: no s'ha trobat l'ordre\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "s'està computant el md5sum de la font hdlist (o síntesi) existent"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "no s'ha pogut registrar el fitxer rpm"
+msgid "examining MD5SUM file"
+msgstr "s'està examinant el fitxer MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permet de preguntar a l'usuari si vol instal·lar paquets "
-"sense\n"
-"                   comprovar les dependències.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "s'està copiant l'hdlist (o la síntesi) font de \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "incapaç de gestionar el protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "s'està recuperant el fitxer hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "s'està computant el md5sum de la font hdlist (o síntesi)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Sí, instal·la'l"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "s'ha afegit la font %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
-"  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
+msgid "reading rpm files from [%s]"
+msgstr "s'està llegint els fitxers rpm des de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
-"actualitza=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "el md5sum no concorda"
+msgid "no rpm files found from [%s]"
+msgstr "no s'han trobat fitxers rpm des de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "error de sintaxi en fitxer de configuració a la línia %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
-"  els noms o fitxers rpm subministrats en la línia d'ordres seran "
-"instal·lats.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - utilitza el proxy HTTP especificat, el número de port "
-"s'assumeix\n"
-"                   que és el 1080 per defecte (el format és "
-"<ordinadorcentralproxy[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "per tal d'instal·lar %s"
+msgid "md5sum mismatch"
+msgstr "el md5sum no concorda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entrades reubicades en depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "ha fallat la recuperació de l'hdlist (o la síntesi) de la font"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignora les distincions de majúscules en els patrons.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, 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"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "el fitxer [%s] ja s'està utilitzant en la mateixa font \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "instal·laria en comptes d'actualitzar el paquet %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "s'està recuperant la llista de repliques a %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "no es pot escriure el fitxer list de \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - mostra l'etiqueta url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "s'està escrivint el fitxer list per la font \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "el protocol definit per a %s és desconegut"
+msgid "nothing written in list file for \"%s\""
+msgstr "no s'ha escrit res al fitxer list per a \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
-"  -r             - mostra la versió i llançament juntament amb el nom.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
-"obsolets.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "la font \"%s\" ja existeix"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "s'està instal·lant %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "s'estan llegint les capçaleres de la font \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta l'entrada per actualitzar\n"
-"(una de %s)\n"
+msgid "building hdlist [%s]"
+msgstr "s'està construint l'hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr ""
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "no s'ha pogut eliminar el paquet %s"
+msgid "found %d headers in cache"
+msgstr "s'han trobat %d capçaleres a la memòria cau"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "s'estan esborrant %d capçaleres obsoletes de la memòria cau"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta l'entrada per a eliminar\n"
-"(una de %s)\n"
+msgid "mounting %s"
+msgstr "s'està muntant %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona totes les fonts.\n"
+msgid "unmounting %s"
+msgstr "s'està desmuntant %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta la signatura (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "%s entrades reubicades en depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "cap entrada reubicada en depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuït per els ordinadors de l'àlias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "el nom del fitxer rpm és incorrecte [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "s'està recuperant els fitxer rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - utilitza només les fonts d'actualització.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+msgid "unable to register rpm file"
+msgstr "no s'ha pogut registrar el fitxer rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - restringeix els resultats al grup donat.\n"
+msgid "error registering local packages"
+msgstr "error registrant els paquets locals"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"la font \"%s\" ha provat d'utilitzar un fitxer list en ús, font ignorada"
+msgid "no package named %s"
+msgstr "no hi cap paquet anomenat %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada mal formada: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Els paquets següents contenen %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "eliminar el paquet %s trencarà el vostre sistema"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hi ha múltiples paquets amb el mateix nom de fitxer rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - llista les fonts disponibles.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Alguns dels paquets demanats no es poden instal·lar:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
+"la font \"%s\" usa un fitxer de llista no vàlid:\n"
+"  la rèplica probablement no estigui actualitza, s'està provant un mètode "
+"alternatiu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "cap entrada reubicada en depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "la font \"%s\" no defineix cap ubicació pels fitxers rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - instal·la només paquets de codi font (cap binari).\n"
+msgid "package %s is not found."
+msgstr "no s'ha trobat el paquet %s."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
+msgid "urpmi database locked"
+msgstr "la base de dades de l'urpmi està bloquejada"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
+msgid "medium \"%s\" is not selected"
+msgstr "la font \"%s\" no ha estat seleccionada"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "hi esteu d'acord?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no s'ha pogut llegir el fitxer rpm [%s] des de la font \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fitxer list incoherent per \"%s\", s'ha ignorat la font"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"font incoherent \"%s\", marcada com a extraïble però no és així realment"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...recuperació feta"
+msgid "unable to access medium \"%s\""
+msgstr "no s'ha pogut accedir a al font \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "s'està afegint el paquet %s (id=%d, eid=%d, actualitza=%d, fitxer=%s)"
+msgid "malformed input: [%s]"
+msgstr "entrada mal formada: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "s'està saltant el paquet %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Signatura no vàlida (%s)"
+msgid "Preparing..."
+msgstr "S'està preparant..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid "using process %d for executing transaction"
+msgstr "s'està usant el procés %d per executar la transacció"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versió %s\n"
-"Copyright (C) 1999, 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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
+"s'ha creat una transacció per instal·lar a %s (elimina=%d, instal·la=%d, "
+"actualitza=%d)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
+msgid "unable to create transaction"
+msgstr "no s'ha pogut crear la transacció"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "no es pot determinar la font d'aquest fitxer hdlist [%s]"
+msgid "removing package %s"
+msgstr "s'està eliminant el paquet %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
+msgid "unable to remove package %s"
+msgstr "no s'ha pogut eliminar el paquet %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "la font \"%s\" ha provat d'utilitzar un hdlist en ús, font ignorada"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "s'està afegint el paquet %s (id=%d, eid=%d, actualitza=%d, fitxer=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "degut a conflictes amb %s"
+msgid "unable to install package %s"
+msgstr "no s'ha pogut instal·lar el paquet %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "s'estan esborrant %d capçaleres obsoletes de la memòria cau"
+msgid "due to missing %s"
+msgstr "degut a que falten %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no es pot actualitzar la font \"%s\"\n"
+msgid "due to unsatisfied %s"
+msgstr "degut a %s no satisfetes"
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "trying to promote %s"
 msgstr ""
-"Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "la font virtual \"%s\" no és local, font ignorada"
-
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
-msgstr "S'està preparant..."
-
-#: ../rpm-find-leaves:1
-#, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    el valor per defecte és %s.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
+msgid "in order to keep %s"
+msgstr "per tal de mantenir %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - no intenta buscar cap síntesi o\n"
-"                   fitxer hdlist.\n"
+msgid "in order to install %s"
+msgstr "per tal d'instal·lar %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
+msgid "due to conflicts with %s"
+msgstr "degut a conflictes amb %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
+msgid "unrequested"
+msgstr "no demanat"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Signatura no vàlida (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"sintaxi: %s [opcions]\n"
-"on [opcions] pot ser\n"
+msgid "Invalid Key ID (%s)"
+msgstr "ID de clau no vàlid (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - esborra els rpm de la memòria cau abans de res més.\n"
+msgid "Missing signature (%s)"
+msgstr "Falta la signatura (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"no es pot utilitzar el nom \"%s\" per a la font nom perquè ja està en ús"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"la font virtual \"%s\" hauria de tenir una font hdlist o synthesis vàlida, "
-"s'ignora la font"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Elecció incorrecta, torneu-ho a provar\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -935,1071 +832,1220 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"sintaxi: urpmi.addmedia [opcions] <nom> <url> [with <camí_relatiu>]\n"
-"on <url> és un dels següents:\n"
-"       file://<camí>\n"
-"       ftp://<entrada>:<contrasenya>@<ordinador_central>/<camí> with <nom "
-"relatiu del fitxer hdlist>\n"
-"       ftp://<ordinador_central>/<camí> with <nom relatiu del fitxer "
-"hdlist>\n"
-"       http://<ordinador_central>/<camí> with <nom relatiu del fitxer "
-"hdlist>\n"
-"       removable://<camí>\n"
-"\n"
-"i [opcions] són des de\n"
-
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "s'està copiant l'hdlist (o la síntesi) font de \"%s\"..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "...còpia feta"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - en escollir, selecciona un paquets automàticament.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "no s'ha pogut usar l'opció de paral·lel \"%s\""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - verifica si la instal·lació pot ser duta a terme.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"la font \"%s\" usa un fitxer de llista no vàlid:\n"
-"  la rèplica probablement no estigui actualitza, s'està provant un mètode "
-"alternatiu"
+"  --force        - força l'execució tot i que hi hagi paquets que no "
+"existeixen.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuït per els ordinadors de l'àlias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "La font virtual ha de ser local"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
-msgstr "error registrant els paquets locals"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita la velocitat de descàrrega.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detallat.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
+"  -a             - selecciona tots els paquets que coincideixen amb "
+"l'expressió.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "ha fallat la recuperació de l'hdlist (o la síntesi) de la font"
+msgid "unknown packages"
+msgstr "paquets desconeguts"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "no s'han trobat fitxers rpm des de [%s]"
+msgid "unknown package"
+msgstr "paquet desconegut"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "no s'ha escrit res al fitxer list per a \"%s\""
+msgid "removing package %s will break your system"
+msgstr "eliminar el paquet %s trencarà el vostre sistema"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Els paquets següents tenen signatures incorrectes"
+msgid "Nothing to remove"
+msgstr "Res a eliminar"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "s'està computant el md5sum de la font hdlist (o síntesi) existent"
+msgid "Checking to remove the following packages"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpme:106
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Per a complir les dependències, s'eliminaran els següents paquets (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to install package %s"
-msgstr "no s'ha pogut instal·lar el paquet %s"
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:111 ../urpmi:675
+#, c-format
+msgid "removing %s"
+msgstr "s'està eliminant %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "L'eliminació ha fallat"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - permet de preguntar a l'usuari si vol instal·lar paquets "
-"sense\n"
-"                   comprovar les dependències i la integritat.\n"
+"urpmf versió %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Desa el fitxer"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - utilitza només les fonts donades, s'han de separar amb "
+"comes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - no usis les fonts donades, separades per comes.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  -a             - selecciona tots els paquets que coincideixen amb "
-"l'expressió.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID de clau no vàlid (%s)"
+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"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose             - mode detallat.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - força l'execució tot i que hi hagi paquets que no "
-"existeixen.\n"
+"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no \n"
+"                    s'indica cap etiqueta a la línia de comandes,\n"
+"                    incompatible amb el mode interactiu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - mostra totes les etiquetes.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - mostra l'etiqueta group: grup.\n"
+
+#: ../urpmf:44
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - mostra l'etiqueta size: mida.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
-"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:46
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - mostra l'etiqueta summary: resum.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "falta el <camí relatiu de l'hdlist>\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
 
-#: ../urpme:1
+#: ../urpmf:48
 #, c-format
-msgid "Checking to remove the following packages"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unrequested"
-msgstr "no demanat"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
 
-#: ../urpmf:1
+#: ../urpmf:53
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - mostra l'etiqueta files: tots els fitxers.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - mostra l'etiqueta files: tots els fitxers.\n"
 
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voleu continuar la instal·lació ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no s'ha pogut llegir el fitxer rpm [%s] des de la font \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
+"obsolets.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - utilitza un entorn concret (normalment un\n"
+"                   informe d'errors).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - mostra informació útil en un forma llegible pels humans.\n"
+"  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - usa la url especificada per a la llista de rèpliques, \n"
-"                   la url per defecte és %s\n"
+"  -a             - operador binari AND, cert si les dues expressions son "
+"certes.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - operador binari OR, cert si una expressió és certa.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT unari, cert si la expressió és falsa.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - parentesi esquerre per obrir expressions de grup.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - parentesi dret per tancar expressions de grup.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"El directori [%s] ja existeix, si us plau usa un altre directori per "
-"l'informe d'error o esborra'l"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "s'està desmuntant %s"
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completat, velocitat = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versió %s\n"
+"Copyright (C) 1999, 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"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "s'esta reiniciant urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "s'està examinant el fitxer de síntesi [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selecciona automàticament els paquets per actualitzar el "
+"sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
+"instal·lació.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "..la còpia ha fallat"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - manté els paquets existents si és possible, rebutja els "
+"paquets demanats\n"
+"                   que porten a la eliminació d'altres paquets.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "no es pot accedir al fitxer hdlist de \"%s\", font ignorada"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode silenciós.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose             - mode detallat.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - utilitza cerca difusa (igual que -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - dóna tots els paquets font abans de la baixada (només "
-"'root').\n"
+"  --src          - el paquet següent és un paquet font (igual que -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - extreu capçaleres del paquet llistats des de urpmi db a\n"
-"                   'stdout' (només 'root').\n"
+"  --install-src  - instal·la només paquets de codi font (cap binari).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "paquets desconeguts"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - esborra els rpm de la memòria cau abans de res més.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "s'està seleccionant múltiples fonts: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+"  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
+"  --allow-nodeps - permet de preguntar a l'usuari si vol instal·lar paquets "
+"sense\n"
+"                   comprovar les dependències.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "el fitxer [%s] ja s'està utilitzant en la mateixa font \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - permet de preguntar a l'usuari si vol instal·lar paquets "
+"sense\n"
+"                   comprovar les dependències i la integritat.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat la font"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget per a recuperar fitxers llunyans.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - mostra aquest missatge d'ajuda.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - use curl per a recuperar fitxers llunyans.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "s'ha trobat un manegador paral·lel per als nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita la velocitat de descàrrega.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - cerca inversa a que necessita el paquet.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - utilitza el proxy HTTP especificat, el número de port "
+"s'assumeix\n"
+"                   que és el 1080 per defecte (el format és "
+"<ordinadorcentralproxy[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versió %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi:\n"
+"  --proxy-user   - especifica l'usuari i la contrasenya per a utilitzar la "
+"autenticació\n"
+"                   del proxy (el format és <usuari:contrasenya>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - no mostris el nom de l'etiqueta (per defecte si no \n"
-"                    s'indica cap etiqueta a la línia de comandes,\n"
-"                    incompatible amb el mode interactiu.\n"
+"  --bug          - crea un informe d'errors en el directori\n"
+"                   que s'indica en l'argument següent.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utilitza l'interfície X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis no es pot usar amb --media, --excludemedia, --sortmedia, --"
-"update ni --parallel"
+"  --best-output  - escull la millor interfície d'acord amb l'entorn:\n"
+"                   el mode X o de text.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - usa l'arquitectura especificada, el valor per defecte\n"
-"                   és l'arquitectura del la versió de Mandrake instal·lada.\n"
+"  --verify-rpm   - verifica la signatura rpm abans de la instal·lació\n"
+"                   (--no-verify-rpm la deshabilita, per defecte està "
+"habilitat).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "És correcte?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclou els fitxers de documentació.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "s'està examinant manegador paral·lel en fitxer [%s]"
-
-#: ../urpme:1
-#, c-format
-msgid "Nothing to remove"
-msgstr "Res a eliminar"
+"  -a             - selecciona totes les coincidències en la línia d'ordres.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - permet la cerca en allò que proporcionen els paquets per "
+"a trobar-los.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "s'estan llegint les capçaleres de la font \"%s\""
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - no busquis en 'provides' per a trobar paquets.\n"
 
-#: ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - amplia la cerca a les dependències dels paquets.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - força una cerca difusa (igual que --fuzzy).\n"
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --bug          - crea un informe d'errors en el directori\n"
-"                   que s'indica en l'argument següent.\n"
+"  -s             - el següent paquet és un paquet font (igual que --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "la font \"%s\" no defineix cap ubicació pels fitxers rpm"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode silenciós.\n"
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  els noms o fitxers rpm subministrats en la línia d'ordres seran "
+"instal·lats.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "no es pot escriure el fitxer list de \"%s\""
+msgid "Choose location to save file"
+msgstr "Escolliu la ubicació un desar el fitxer"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
+msgid "Do nothing"
+msgstr "No facis res"
 
-#: ../urpmi:1
+#: ../urpmi:213
 #, c-format
-msgid "Copying failed"
-msgstr "La còpia ha fallat"
+msgid "Yes, really install it"
+msgstr "Sí, instal·la'l"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - imposa la generació de fitxers hdlist.\n"
+msgid "Save file"
+msgstr "Desa el fitxer"
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes només es pot usar amb --parallel"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:230
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
+msgid "Install it"
+msgstr "Instal·la'l"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  -s             - el següent paquet és un paquet font (igual que --src).\n"
+"El directori [%s] ja existeix, si us plau usa un altre directori per "
+"l'informe d'error o esborra'l"
 
-#: ../urpmi:1
+#: ../urpmi:240
 #, c-format
-msgid "installing %s"
-msgstr "s'està instal·lant %s"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "s'està llegint els fitxers rpm des de [%s]"
+msgid "Copying failed"
+msgstr "La còpia ha fallat"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
+msgid "Only superuser is allowed to install packages"
+msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:396
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - en escollir, selecciona un paquets automàticament.\n"
+msgid "One of the following packages is needed:"
+msgstr "Cal un dels paquets següents:"
 
-#: ../urpme:1
+#: ../urpmi:403
 #, c-format
-msgid "Removing failed"
-msgstr "L'eliminació ha fallat"
+msgid "What is your choice? (1-%d) "
+msgstr "Quina és la vostra elecció? (1-%d) "
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
+msgid "Package installation..."
+msgstr "Instal·lació de paquets..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "package %s is not found."
-msgstr "no s'ha trobat el paquet %s."
+msgid "Initializing..."
+msgstr "S'està inicialitzant..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "s'està esborrant la font \"%s\""
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Alguns dels paquets demanats no es poden instal·lar:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
+msgid "do you agree ?"
+msgstr "hi esteu d'acord?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Cancel·la"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"La instal·lació no pot continuar ja que els següents paquets\n"
+"s'han d'eliminar per poder actualitzar uns altres:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - el paquet següent és un paquet font (igual que -s).\n"
+"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - utilitza un entorn concret (normalment un\n"
-"                   informe d'errors).\n"
+"Per complir les dependències, s'instal·laran els %d paquets següents (%d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
+"Es necessita ser 'root' per a instal·lar les següents dependències:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no s'ha pogut accedir a al font \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no es pot crear la font \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
+msgid "Press Enter when ready..."
+msgstr "Premeu Intro quan estigui fet..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "S'està descarregant el paquet `%s'..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completat, TE = %s, velocitat = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completat, velocitat = %s"
 
-#: ../urpmi:1
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Els paquets següents tenen signatures incorrectes"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Voleu continuar la instal·lació ?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Es necessita ser 'root' per a instal·lar les següents dependències:\n"
+"La instal·lació ha fallat, no falten alguns fitxers.\n"
+"\n"
 "%s\n"
+"Potser voleu actualitzar la base de dades urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - mostra els canvis.\n"
+msgid "Installation failed"
+msgstr "La instal·lació ha fallat"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora la font"
+msgid "distributing %s"
+msgstr "s'està distribuint %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parentesi dret per tancar expressions de grup.\n"
+msgid "installing %s"
+msgstr "s'està instal·lant %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
+
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
-"no s'ha trobat cap programa per baixar coses de la xarxa, els programes "
-"suportats són: %s\n"
+"Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "s'està examinant el fitxer hdlist [%s]"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "copying hdlists file..."
-msgstr "s'està copiant el fitxer hdlists..."
+msgid "%d installation transactions failed"
+msgstr "han fallat %d transaccions d'instal·lació"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "s'està escrivint el fitxer list per la font \"%s\""
+msgid "Installation is possible"
+msgstr "La instal·lació és possible"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
+msgid "Everything already installed"
+msgstr "Ja està tot instal·lat"
 
-#: ../urpmf:1
+#: ../urpmi:797
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "restarting urpmi"
+msgstr "s'esta reiniciant urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
+"sintaxi: urpmi.addmedia [opcions] <nom> <url> [with <camí_relatiu>]\n"
+"on <url> és un dels següents:\n"
+"       file://<camí>\n"
+"       ftp://<entrada>:<contrasenya>@<ordinador_central>/<camí> with <nom "
+"relatiu del fitxer hdlist>\n"
+"       ftp://<ordinador_central>/<camí> with <nom relatiu del fitxer "
+"hdlist>\n"
+"       http://<ordinador_central>/<camí> with <nom relatiu del fitxer "
+"hdlist>\n"
+"       removable://<camí>\n"
+"\n"
+"i [opcions] són des de\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "No facis res"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea una font d'actualització.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "s'està utilitzant la font associada al mode paral·lel : %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "s'està muntant %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"no s'ha pogut tenir cura de la font \"%s\" perquè el fitxer list és "
-"utilitzat per una altra font"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "no es poden recuperar els paquets font. S'està interrompent"
+"  --no-probe     - no intenta buscar cap síntesi o\n"
+"                   fitxer hdlist.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automàticament crea tots les fonts des d'una font\n"
+"                   d'instal·lació.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completat, TE = %s, velocitat = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - usa la url especificada per a la llista de rèpliques, \n"
+"                   la url per defecte és %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - mai demana desinstal·lar un paquet, avorta la "
-"instal·lació.\n"
+"  --arch         - usa l'arquitectura especificada, el valor per defecte\n"
+"                   és l'arquitectura del la versió de Mandrake instal·lada.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprimeix grups amb el nom.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - buida el directori de memòria cau de capçaleres.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "la font \"%s\" no ha estat seleccionada"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - imposa la generació de fitxers hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "no es poden afegir actualitzacions d'una distribució cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
+msgid "retrieving mirrors at %s ..."
+msgstr "s'està recuperant la llista de repliques a %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "no es pot trobar el fitxer hdlist per a \"%s\", s'ignora la font"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "no es pot actualitzar la font \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parentesi esquerre per obrir expressions de grup.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "falta el <camí relatiu de l'hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "massa punts de muntatge per la font extraïble \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "falta el `with' per a les fonts de xarxa\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operador binari AND, cert si les dues expressions son "
-"certes.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "no es pot crear la font \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"no s'ha pogut accedir a la font \"%s\",\n"
-"pot passar si havies muntat manualment el directori al crear la font."
+"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
+"on <nom> és el nom de la font a eliminar.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - mostra l'etiqueta group: grup.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona totes les fonts.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - utilitza només les fonts donades, s'han de separar amb "
-"comes.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "no s'ha pogut crear la transacció"
+"\n"
+"opcions desconegudes '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "s'està recuperant els fitxers rpm de la font \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"no hi ha res per eliminar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"falta l'entrada per a eliminar\n"
+"(una de %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "s'està distribuint %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"sintaxi: urpmi.update [opcions] <nom> ...\n"
+"on <nom> és el nom de la font a actualitzar.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "escriure fitxer de configuració [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - força l'actualització de la clau gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona tots les fonts no extraïbles.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifica la signatura rpm abans de la instal·lació\n"
-"                   (--no-verify-rpm la deshabilita, per defecte està "
-"habilitat).\n"
+"falta l'entrada per actualitzar\n"
+"(una de %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versió %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - llista els paquets disponibles.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea una font d'actualització.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - llista les fonts disponibles.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - llista les fonts disponibles i la seva url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - força una cerca difusa (igual que --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "D'acord"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - llista els nodes disponibles quan s'utilitza --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descripció hdlist incorrecta \"%s\" en el fitxer hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - llista els àlias paral·lels disponibles.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "s'està eliminant %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extreu capçaleres del paquet llistats des de urpmi db a\n"
+"                   'stdout' (només 'root').\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
+"  --sources      - dóna tots els paquets font abans de la baixada (només "
+"'root').\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - mostra l'etiqueta size: mida.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "per tal de mantenir %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - mostra els canvis.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "degut a %s no satisfetes"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - amplia la cerca a les dependències dels paquets.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Instal·lació automàtica dels paquets...\n"
-"Heu demanat la instal·lació del paquet %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "la base de dades de l'urpmi està bloquejada"
+"  -u             - elimina el paquet si hi ha instal·lada una versió més "
+"nova.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - cerca inversa a que necessita el paquet.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - mostra informació útil en un forma llegible pels humans.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "agafant dispositiu extraïble com a \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprimeix grups amb el nom.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
+"  -r             - mostra la versió i llançament juntament amb el nom.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - utilitza cerca difusa (igual que -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - elimina el paquet si hi ha instal·lada una versió més "
-"nova.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - intenta trobar un fitxer hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes només es pot usar amb --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "degut a que falten %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - utilitza només les fonts d'actualització.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"sintaxi: urpmi.update [opcions] <nom> ...\n"
-"on <nom> és el nom de la font a actualitzar.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "provant de passar per alt la font existent \"%s\", evitant"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Un dels paquets següents necessita ser instal·lat %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - verifica si la instal·lació pot ser duta a terme.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Programa per baixar de la xarxa `%s' desconegut !!!\n"
diff --git a/po/cs.po b/po/cs.po
index 4615a204..7877c043 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 19:47+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -42,1974 +42,2020 @@ msgstr "AaYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instaluji %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
-"                   média.\n"
+"Automatická instalace balíčků....\n"
+"Zadal jste instalaci balíčku %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "nelze otevřít databázi rpmdb"
+msgid "Is this OK?"
+msgstr "Je to správně?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help           - vypíše tuto nápovědu.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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ů:"
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "odstraňuje se balíček %s"
+msgid " (Y/n) "
+msgstr " (A/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: příkaz nenalezen\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Nelze použít paralelní režim spolu s režimem use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"použití: %s [volby]\n"
+"kde [volby] jsou tyto\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "vše je již nainstalováno"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - vypíše tuto nápovědu.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c           - smaže dočasný adresář.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - omezí výsledky na danou skupinu.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "pro spuštění transakce se použije proces %d"
+msgid "                    defaults is %s.\n"
+msgstr "                    výchozí je %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - vypíše tag poskytuje: all provides.\n"
+msgid "unknown protocol defined for %s"
+msgstr "neznámý protokol definovaný pro %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaká je vaše volba? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nebyla nalezena aplikace pro stažení přes web, podporované jsou: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "nalezeno %d hlaviček"
+msgid "unable to handle protocol: %s"
+msgstr "nelze zpracovat protokol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "více balíčků má stejný název souboru RPM \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaktická chyba v souboru s nastavením na řádku %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - uživatel a heslo, které se má použít u ověření\n"
-"                   proxy (formát je <uživatel:heslo>).\n"
+"zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "počítám závislosti v druhém průchodu\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý seznam"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "načítám rpm soubor [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"nelze pracovat se zdrojem \"%s\", pokud je seznam souborů využíván jiným"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nelze použít jméno \"%s\" pro nepojmenovaný zdroj protože to je již použito"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...načítání selhalo: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"pokud neexistuje seznam souborů [%s], nelze zařadit zdroj \"%s\" mezi "
+"používané"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nelze prozkoumat seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
-"  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
+"zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instalace balíčku..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nelze získat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "neplatný název rpm souboru [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokus o vynechání existujícího zdroje \"%s\""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "špatně zadaná proxy na příkazové řádce\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuální zdroj \"%s\" by neměl mít definován soubor hdlist nebo seznamu, "
+"zdroj se ignoruje"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "Selhalo instalačních transakcí: %d"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuální zdroj \"%s\" by měl mít jasnou adresu URL, zdroj se ignoruje"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"nelze přistupovat k prvnímu instalačnímu médiu (chybí soubor Mandrake/base/"
-"hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nelze najít seznam souborů pro \"%s\", zdroj se ignoruje"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Vyberte, kam chcete uložit soubor"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nesouvislý seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - vypíše tag souhrn: summary.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nelze prozkoumat seznam souborů pro \"%s\", zdroj bude ignorován"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Následující balíčky obsahují: %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instalovat"
+msgid "taking removable device as \"%s\""
+msgstr "pokládám vyjímatelné médium za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X           - použije X prostředí.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Je zapotřebí jeden z následujících balíčků:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nelze načíst cestu pro výměnné médium \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Aby byly splněny závislosti, budou odebrány následující balíčky (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "nelze zapsat soubor s nastavením [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - vybere takový výstup, který odpovídá prostředí:\n"
-"                          grafický nebo textový režim.\n"
+msgid "write config file [%s]"
+msgstr "zapisuji soubor s nastavením [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Stahuje se balíček `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Nelze použít paralelní režim spolu s režimem use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Co lze učinit s binárními soubory RPM při použití --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nelze zpracovat \"%s\" v souboru [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "zkoumám paralelní zpracování v souboru [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "žádný balíček s názvem %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "nalezeno paralelní zpracování pro uzly: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "používám asociované zdroje pro paralelní režim: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalace selhala, některé soubory chybí:\n"
-"%s\n"
-"Možná potřebujete aktualizovat vaši databázi urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "nelze použít paralelní volbu \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"použití: urpmi.removemedia [-a] <jméno> ...\n"
-"kde <jméno> je název zdroje pro aktualizaci.\n"
+"volbu --synthesis nelze použít s volbami --media, --excludemedia, --"
+"sortmedia, --update nebo --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalace nemůže pokračovat, protože následující balíčky musí\n"
-"být odstraněny, aby bylo možné jiné aktualizovat:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "zpracovávám soubor syntézy [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "chybí `with' pro síťový zdroj\n"
+msgid "examining hdlist file [%s]"
+msgstr "zpracovávám soubor hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - vypíše soubory v balíčku.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuální zdroj \"%s\" není lokální, zdroj se ignoruje"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "neznámý balíček"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problém při čtení souboru se syntézou nebo hdlist zdroje \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalace je možná"
+msgid "performing second pass to compute dependencies\n"
+msgstr "počítám závislosti v druhém průchodu\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "přeskakuji balíček %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Aby byly splněny závislosti, budou nainstalovány následující balíčky (celkem "
-"%d, %d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "místo aktualizace bych instaloval balíček %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"pokud neexistuje seznam souborů [%s], nelze zařadit zdroj \"%s\" mezi "
-"používané"
+msgid "unable to open rpmdb"
+msgstr "nelze otevřít databázi rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (a/N) "
+msgid "medium \"%s\" already exists"
+msgstr "zdroj \"%s\" již existuje"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nelze přidat aktualizace pro distribuci Cooker\n"
+msgid "virtual medium need to be local"
+msgstr "virtuální zdroj musí být lokální"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - režim s výpisy.\n"
+msgid "added medium %s"
+msgstr "přidán zdroj %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializace..."
+msgid "unable to access first installation medium"
+msgstr "nelze přistupovat k prvnímu instalačnímu médiu"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
+msgid "copying hdlists file..."
+msgstr "kopíruji soubor hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - vypíše všechny tagy.\n"
+msgid "...copying failed"
+msgstr "...kopírování selhalo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
+msgid "...copying done"
+msgstr "...kopírování ukončeno"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuální zdroj \"%s\" by neměl mít definován soubor hdlist nebo seznamu, "
-"zdroj se ignoruje"
+"nelze přistupovat k prvnímu instalačnímu médiu (chybí soubor Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"počítám sumu md5 zkopírovaného zdrojového souboru hdlist (nebo soubor se "
-"syntézou)"
+msgid "retrieving hdlists file..."
+msgstr "načítám soubor hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
+msgid "...retrieving done"
+msgstr "...načítání ukončeno"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Stiskněte klávesu Enter až budete připraveni..."
+msgid "...retrieving failed: %s"
+msgstr "...načítání selhalo: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"neznámé volby '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "špatný popis hdlist \"%s\" v souboru hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - rozdělit do menších transakcí, pokud se má instalovat "
-"nebo\n"
-"                   aktualizovat více balíčků než zadaná hodnota,\n"
-"                   výchozí hodnota je %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "pokouším se vybrat neexistující zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problém při čtení souboru se syntézou nebo hdlist zdroje \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "vybírám více zdrojů: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget          - použije program wget pro načtení souborů.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p           - pokusí se najít balíček v položkách provides.\n"
+msgid "removing medium \"%s\""
+msgstr "odebírám zdroj \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - vypíše seznam uzlů k dispozici při použití volby --"
-"parallel.\n"
+"nelze přistupovat ke zdroji \"%s\",\n"
+"což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "vytvářím hdlist [%s]"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"virtuální zdroj \"%s\" by měl mít platný soubor hdlist nebo syntézy, zdroj "
+"se ignoruje"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1004
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "copying description file of \"%s\"..."
+msgstr "kopíruji soubor s popisy pro \"%s\"..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  --keep         - pokud je to možné, ponechá existující a odmítne ty z "
-"požadovaných\n"
-"                   balíčků, které vyžadují odstranění jiných.\n"
+"počítám součet md5 existujícího zdrojového souboru hdlist (nebo souboru se "
+"syntézou)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "testuji MD5SUM soubor"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: příkaz nenalezen\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopíruji zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "nelze registrovat rpm soubor"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
-"  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
-"                   kontroly závislostí.\n"
+"počítám sumu md5 zkopírovaného zdrojového souboru hdlist (nebo soubor se "
+"syntézou)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nelze zpracovat protokol: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopírování [%s] selhalo (chyba v kontrolním součtu md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "načítám soubor hdlists..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Opravdu jej nainstalovat"
+msgid "reading rpm files from [%s]"
+msgstr "načítám soubory RPM z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "přidán zdroj %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nelze číst soubory RPM z [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - udržuje nepoužívané rpm v cache.\n"
+msgid "no rpm files found from [%s]"
+msgstr "nebyl nalezen žádný soubor RPM na [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
+
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "nalezen zdrojový hdlist (nebo soubor se syntézou) jako %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
-"aktualizace=%d)"
+"počítám součet md5 získaného zdrojového souboru hdlist (nebo souboru se "
+"syntézou)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "nerovnají se součty md5"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaktická chyba v souboru s nastavením na řádku %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "načítání zdrojového souboru hdlist (nebo souboru se syntézou) selhalo"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
-"                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "soubor [%s] je již používán na tomtéž zdroji \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "pro instalaci %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "přesunuté položky %s v souboru depslist"
+msgid "unable to write list file of \"%s\""
+msgstr "nelze zapsat seznam souborů pro zdroj \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "zapisuji seznam souborů pro zdroj \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
+msgid "nothing written in list file for \"%s\""
+msgstr "není co zapisovat v seznamu souborů pro \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "místo aktualizace bych instaloval balíček %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "načítám zrcadla z %s ..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - vypíše tag url: url.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "neznámý protokol definovaný pro %s"
+msgid "reading headers from medium \"%s\""
+msgstr "načítám hlavičky ze zdroje \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
+msgid "building hdlist [%s]"
+msgstr "vytvářím hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - vypíše tag nahrazuje: all obsoletes.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "zdroj \"%s\" již existuje"
+msgid "found %d headers in cache"
+msgstr "nalezeno %d hlaviček"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "instaluji %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "odebírám %d starých hlaviček"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"záznam pro update chybí\n"
-"(jeden z %s)\n"
+msgid "mounting %s"
+msgstr "připojuji %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "pokouším se postoupit %s"
+msgid "unmounting %s"
+msgstr "odpojuji %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nelze odstranit balíček %s"
+msgid "relocated %s entries in depslist"
+msgstr "přesunuté položky %s v souboru depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "v souboru depslist nejsou žádné přesunuté položky"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"záznam pro odebrání chybí\n"
-"(jeden z %s)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "neplatný název rpm souboru [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a           - vybere všechna média.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "načítám rpm soubor [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Chybí podpis (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "nelze zpřístupnit rpm soubor [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nelze číst soubory RPM z [%s]: %s"
+msgid "unable to register rpm file"
+msgstr "nelze registrovat rpm soubor"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgid "error registering local packages"
+msgstr "chyba při registraci lokálních balíčků"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
+msgid "no package named %s"
+msgstr "žádný balíček s názvem %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Následující balíčky obsahují: %s: %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr " (A/n) "
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "více balíčků má stejný název souboru RPM \"%s\""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - omezí výsledky na danou skupinu.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nelze korektně zpracovat [%s] kvůli hodnotě \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "zdroj \"%s\" bude ignorován, pokouší se použít již použitý seznam"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"zdroj \"%s\" používá neplatný seznam souborů:\n"
+"  zrcadlo asi není aktuální, pokusím se použít alternativní metodu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "zkreslený vstup: [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "zdroj \"%s\" nedefinuje žádné umístění rpm souborů"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
+msgid "package %s is not found."
+msgstr "balíček %s nenalezen"
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
+msgid "urpmi database locked"
+msgstr "databáze pro urpmi je zamknutá"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Některé požadované balíčky nebylo možné nainstalovat:\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "zdroj \"%s\" není vybrán"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaluji balíček `%s' (%s/%s)..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "v souboru depslist nejsou žádné přesunuté položky"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "nesouvislé médium \"%s\" je označeno jako vyjímatelné, ale není"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
-"souborů).\n"
+msgid "unable to access medium \"%s\""
+msgstr "nelze přistoupit na zdroj \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - použije program curl pro načtení souborů.\n"
+msgid "malformed input: [%s]"
+msgstr "zkreslený vstup: [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "načítám rpm soubory ze zdroje \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "souhlasíte?"
+msgid "Preparing..."
+msgstr "Připravuji..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nesouvislý seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "using process %d for executing transaction"
+msgstr "pro spuštění transakce se použije proces %d"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...načítání ukončeno"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
+"aktualizace=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "přidávám balíček %s (id=%d, eid=%d, aktualizace=%d, soubor=%s)"
+msgid "unable to create transaction"
+msgstr "nelze vytvořit transakci"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "přeskakuji balíček %s"
+msgid "removing package %s"
+msgstr "odstraňuje se balíček %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Neplatný podpis (%s)"
+msgid "unable to remove package %s"
+msgstr "nelze odstranit balíček %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "přidávám balíček %s (id=%d, eid=%d, aktualizace=%d, soubor=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verze %s\n"
-"Copyright ©1999, 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"
+msgid "unable to install package %s"
+msgstr "nelze nainstalovat balíček %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nelze korektně zpracovat [%s] kvůli hodnotě \"%s\""
+msgid "due to missing %s"
+msgstr "z důvodu chybějícího %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
+msgid "due to unsatisfied %s"
+msgstr "z důvodu nesplněného %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nelze zjistit zdroj pro tento soubor hdlist [%s]"
+msgid "trying to promote %s"
+msgstr "pokouším se postoupit %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nelze zpracovat soubor hdlist pro zdroj \"%s\""
+msgid "in order to keep %s"
+msgstr "aby bylo možné zachovat %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"zdroj \"%s\" bude ignorován, pokouší se použít již použitý soubor hdlist"
+msgid "in order to install %s"
+msgstr "pro instalaci %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z důvodu konfliktů s %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "odebírám %d starých hlaviček"
+msgid "unrequested"
+msgstr "nevyžádán"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nelze aktualizovat zdroj \"%s\"\n"
+msgid "Invalid signature (%s)"
+msgstr "Neplatný podpis (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "Neplatné ID klíče (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuální zdroj \"%s\" není lokální, zdroj se ignoruje"
+msgid "Missing signature (%s)"
+msgstr "Chybí podpis (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "Připravuji..."
+msgid "bad proxy declaration on command line\n"
+msgstr "špatně zadaná proxy na příkazové řádce\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    výchozí je %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "použiji jiné vyjímatelné zařízení [%s] pro \"%s\""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Je mi líto, to je špatná volba. Zkuste to znovu\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     - nepokoušet se hledat žádný soubor hdlist\n"
-"                   nebo soubor se syntézou.\n"
+"urpme verze %s\n"
+"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nehledá balíček v položkách provides.\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help           - vypíše tuto nápovědu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopírování [%s] selhalo (chyba v kontrolním součtu md5sum)"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - nastaví urpmi za provozu ze stromu distribuce.\n"
-"                   To umožní dotaz na distribuci.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"použití: %s [volby]\n"
-"kde [volby] jsou tyto\n"
+"  --force       - spustí program i v případě, že některé balíčky chybí.\n"
 
-#: ../urpmi:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
-"nelze použít jméno \"%s\" pro nepojmenovaný zdroj protože to je již použito"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - vypíše tag konflikty: all conflicts.\n"
+"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"virtuální zdroj \"%s\" by měl mít platný soubor hdlist nebo syntézy, zdroj "
-"se ignoruje"
+"  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
+"                   při (od)instalaci chroot s volbou --root.\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme verze %s\n"
-"Copyright ©1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - režim s výpisy.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"použití: urpmi.addmedia [volby] <jméno> <url> [s <relativní_cestou>]\n"
-"kde <url> je jedno z následujících\n"
-"      file://<cesta>\n"
-"      ftp://<login>:<heslo>@<host>/<cesta> s <relativním jménem souboru "
-"hdlistu>\n"
-"      ftp://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
-"      http://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
-"      removable://<cesta>\n"
-"\n"
-"a [volby] jsou z\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopíruji zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
+msgid "unknown packages"
+msgstr "neznámé balíčky"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...kopírování ukončeno"
+msgid "unknown package"
+msgstr "neznámý balíček"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nelze použít paralelní volbu \"%s\""
+msgid "removing package %s will break your system"
+msgstr "odebrání balíčku %s naruší funkčnost vašeho systému"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"zdroj \"%s\" používá neplatný seznam souborů:\n"
-"  zrcadlo asi není aktuální, pokusím se použít alternativní metodu"
+msgid "Nothing to remove"
+msgstr "Není co odebrat"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "nelze přistupovat k prvnímu instalačnímu médiu"
+msgid "Checking to remove the following packages"
+msgstr "Kontrola odebrání následujících balíčků"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuální zdroj musí být lokální"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Aby byly splněny závislosti, budou odebrány následující balíčky (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "chyba při registraci lokálních balíčků"
+msgid " (y/N) "
+msgstr " (a/N) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
+msgid "removing %s"
+msgstr "odstraňuje se %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "nalezen zdrojový hdlist (nebo soubor se syntézou) jako %s"
+msgid "Removing failed"
+msgstr "Odebírání selhalo"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "načítání zdrojového souboru hdlist (nebo souboru se syntézou) selhalo"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verze %s\n"
+"Copyright ©2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nebyl nalezen žádný soubor RPM na [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "není co zapisovat v seznamu souborů pro \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Následující balíčky mají špatné signatury"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"počítám součet md5 existujícího zdrojového souboru hdlist (nebo souboru se "
-"syntézou)"
+"  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
+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"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "nelze nainstalovat balíček %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - užvaněný režim.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
-"                   kontroly závislostí a integrity.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "Uložit soubor"
+"  --quiet        - nevypíše název tagu (výchozí chování, pokud není název "
+"tagu zadán\n"
+"z příkazové řádky, není kompatibilní s interaktivním režimem).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - nevytiskne stejné řádky.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nelze zapsat soubor s nastavením [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - vypíše všechny tagy.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - vypíše tag skupina: group.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Neplatné ID klíče (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - vypíše tag velikost: size.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force       - spustí program i v případě, že některé balíčky chybí.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - vypíše tag epocha: epoch.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nelze načíst cestu pro výměnné médium \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - vypíše tag souhrn: summary.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - vypíše tag popis: description.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - vypíše tag sourcerpm: source rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - vypíše tag packager: packager.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativní cesta k hdlistu> chybí\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - vypíše tag buildhost: build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrola odebrání následujících balíčků"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - vypíše tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "nevyžádán"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - vypíše tag poskytuje: all provides.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nelze zpřístupnit rpm soubor [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - vypíše tag vyžaduje: all requires.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - vypíše tag soubory: all files.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nelze zpracovat \"%s\" v souboru [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokračovat v instalaci?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - vypíše tag konflikty: all conflicts.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nelze načíst soubor RPM [%s] pro zdroj \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - vypíše tag nahrazuje: all obsoletes.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
-"                   při instalaci chroot s volbou --root.\n"
+"  --env          - použij specifické prostředí (většinou hlášení\n"
+"                   o chybě).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "vytvářím syntézu pro hdlist pro zdroj \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
+"  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - použije se zadaná verze distribuce, výchozí verze je "
-"převzata\n"
-"                   z verze instalovaného balíčku mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e           - vloží kód Perl přímo jako perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
-"                   %s\n"
+"  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
-"                   při (od)instalaci chroot s volbou --root.\n"
+"  -o             - binární operátor OR, true pokud jeden z výrazů platí.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unární operátor NOT, true pokud výraz neplatí.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - levá závorka pro otevření skupiny výrazů.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - pravá závorka pro uzavření skupiny výrazů.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
-"nebo jej odstraňte"
+"zpětné volání je:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "odpojuji %s"
+msgid "using specific environment on %s\n"
+msgstr "používá se specifické prostředí na %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% dokončeno, rychlost = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verze %s\n"
+"Copyright ©1999, 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"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "restartuji urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "zpracovávám soubor syntézy [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nikdy se neptat na odstranění balíčku, přerušit "
+"instalaci.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopírování selhalo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - pokud je to možné, ponechá existující a odmítne ty z "
+"požadovaných\n"
+"                   balíčků, které vyžadují odstranění jiných.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"zdroj \"%s\" bude ignorován, protože nelze načíst soubor hdlist pro zdroj"
+"  --split-level  - rozdělit do menších transakcí, pokud se má instalovat "
+"nebo\n"
+"                   aktualizovat více balíčků než zadaná hodnota,\n"
+"                   výchozí hodnota je %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q           - režim bez výpisů.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - malé velikost transakce, výchozí je %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - užvaněný režim.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy          - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
-"root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - extrahuje hlavičky pro balíček z urpmi db na std.\n"
-"                   výstup.\n"
+"  --install-src  - instalovat pouze balíček se zdroji (bez binárních "
+"souborů).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "neznámé balíčky"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "vybírám více zdrojů: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - udržuje nepoužívané rpm v cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f        - společně se jménem vypíše verzi, vydání a architekturu.\n"
+"  --allow-nodeps - povolí žádost na uživatele, aby instaloval balíčky bez\n"
+"                   kontroly závislostí.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "soubor [%s] je již používán na tomtéž zdroji \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - povolí žádost na uživatele, aby instaloval balíčky bez\n"
+"                   kontroly závislostí a integrity.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - nastavit urpmi za provozu ze stromu distribuce, užitečné\n"
+"                   při instalaci chroot s volbou --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nelze najít seznam souborů pro \"%s\", zdroj se ignoruje"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget          - použije program wget pro načtení souborů.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - vypíše tuto nápovědu.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - použije program curl pro načtení souborů.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nalezeno paralelní zpracování pro uzly: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - omezení rychlosti stahování.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"zpětné volání je:\n"
-"%s\n"
+"  --resume       - obnoví stahování částečně stažených souborů\n"
+"                   (--no-resume obnovení zakáže, implicitně je zakázáno).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - použij zadanou HTTP proxy, číslo portu se předpokládá\n"
+"                   1080, jako výchozí (formát je <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf verze %s\n"
-"Copyright ©2002 MandrakeSoft.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití:\n"
+"  --proxy-user   - uživatel a heslo, které se má použít u ověření\n"
+"                   proxy (formát je <uživatel:heslo>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - nevypíše název tagu (výchozí chování, pokud není název "
-"tagu zadán\n"
-"z příkazové řádky, není kompatibilní s interaktivním režimem).\n"
+"  --bug          - vygeneruje hlášení o chybě do adresáře \n"
+"                   zadaného následujícím parametrem.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - nevytiskne stejné řádky.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X           - použije X prostředí.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"volbu --synthesis nelze použít s volbami --media, --excludemedia, --"
-"sortmedia, --update nebo --parallel"
+"  --best-output  - vybere takový výstup, který odpovídá prostředí:\n"
+"                          grafický nebo textový režim.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - použije se zadaná architektura, výchozí je arch.\n"
-"                   balíčku mandrake-release.\n"
+"  --verify-rpm   - zkontroluje před instalací signaturu balíčku RPM\n"
+"                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Je to správně?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - nebrat v úvahu cestu oddělenou čárkami.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - vynechá soubory s dokumentací.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-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"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vybere všechny vyhovující z příkazové řádky.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "zkoumám paralelní zpracování v souboru [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p           - pokusí se najít balíček v položkách provides.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Není co odebrat"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - nehledá balíček v položkách provides.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "načítám hlavičky ze zdroje \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q           - režim bez výpisů.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - vygeneruje hlášení o chybě do adresáře \n"
-"                   zadaného následujícím parametrem.\n"
+"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "zdroj \"%s\" nedefinuje žádné umístění rpm souborů"
+msgid "Choose location to save file"
+msgstr "Vyberte, kam chcete uložit soubor"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - vypíše tag sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Co lze učinit s binárními soubory RPM při použití --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nelze zapsat seznam souborů pro zdroj \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Vybrali jste balíček se zdroji:\n"
+"\n"
+"%s\n"
+"\n"
+"Tento balíček pravděpodobně nechcete na svém počítači instalovat\n"
+"(jeho instalace vám umožní provádět změny ve zdrojovém kódu programu\n"
+"a program překládat).\n"
+"\n"
+"Jak chcete pokračovat?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - vypíše tag vyžaduje: all requires.\n"
+msgid "Do nothing"
+msgstr "Nedělat nic"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "pokouším se vybrat neexistující zdroj \"%s\""
+msgid "Yes, really install it"
+msgstr "Opravdu jej nainstalovat"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - vypíše tag popis: description.\n"
+msgid "Save file"
+msgstr "Uložit soubor"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopírování selhalo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Chystáte se instalovat na váš počítač následující balíček se software:\n"
+"\n"
+"%s\n"
+"\n"
+"Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f         - provede generování hdlist souborů.\n"
+msgid "Install it"
+msgstr "Instalovat"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Adresář [%s] již existuje, použijte prosím pro hlášení o chybě jiný adresář "
+"nebo jej odstraňte"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nebyl nalezen soubor hdlist pro zdroj \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nelze vytvořit adresář [%s] pro uložení hlášení o chybě"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s              - další balíček je zdrojový (stejné jako --src).\n"
+msgid "Copying failed"
+msgstr "Kopírování selhalo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "instaluji %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Instalovat balíčky může pouze uživatel root"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "načítám soubory RPM z [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopíruji soubor s popisy pro \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Jaká je vaše volba? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto       - automaticky vybere balíček z výběru.\n"
+msgid "Package installation..."
+msgstr "Instalace balíčku..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Odebírání selhalo"
+msgid "Initializing..."
+msgstr "Inicializace..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální,\n"
-"                   je povolen pouze protokol file://.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "balíček %s nenalezen"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "odebírám zdroj \"%s\""
+"Některé požadované balíčky nebylo možné nainstalovat:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
+msgid "do you agree ?"
+msgstr "souhlasíte?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Zrušit"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Instalace nemůže pokračovat, protože následující balíčky musí\n"
+"být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Následující balíčky musí být odstraněny, aby bylo možné jiné aktualizovat:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - použij specifické prostředí (většinou hlášení\n"
-"                   o chybě).\n"
+"Aby byly splněny závislosti, budou nainstalovány následující balíčky (celkem "
+"%d, %d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
+"Pro instalaci následujících závislostí potřebujete mít právo root:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nelze přistoupit na zdroj \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "nelze získat zdrojový balíček, končím"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nelze vytvořit zdroj \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosím vložte médium nazvané \"%s\" do zařízení [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - vypíše tag packager: packager.\n"
+msgid "Press Enter when ready..."
+msgstr "Stiskněte klávesu Enter až budete připraveni..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "Stahuje se balíček `%s'..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% dokončeno, rychlost = %s"
 
-#: ../urpmi:1
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Následující balíčky mají špatné signatury"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokračovat v instalaci?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Pro instalaci následujících závislostí potřebujete mít právo root:\n"
+"Instalace selhala, některé soubory chybí:\n"
 "%s\n"
+"Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - vytiskne změnový log.\n"
+msgid "Installation failed"
+msgstr "Chyba při instalaci"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nelze získat seznam souborů pro \"%s\", zdroj bude ignorován"
+msgid "distributing %s"
+msgstr "distribuuji %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - pravá závorka pro uzavření skupiny výrazů.\n"
+msgid "installing %s"
+msgstr "instaluji %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nebyla nalezena aplikace pro stažení přes web, podporované jsou: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaluji balíček `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "zpracovávám soubor hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mám zkusit instalaci bez kontroly závislostí? (a/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopíruji soubor hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mám zkusit instalaci ještě razantněji (--force)? (a/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "zapisuji seznam souborů pro zdroj \"%s\""
+msgid "%d installation transactions failed"
+msgstr "Selhalo instalačních transakcí: %d"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuální zdroj \"%s\" by měl mít jasnou adresu URL, zdroj se ignoruje"
+msgid "Installation is possible"
+msgstr "Instalace je možná"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - vypíše tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "vše je již nainstalováno"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Nedělat nic"
+msgid "restarting urpmi"
+msgstr "restartuji urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"použití: urpmi.addmedia [volby] <jméno> <url> [s <relativní_cestou>]\n"
+"kde <url> je jedno z následujících\n"
+"      file://<cesta>\n"
+"      ftp://<login>:<heslo>@<host>/<cesta> s <relativním jménem souboru "
+"hdlistu>\n"
+"      ftp://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
+"      http://<host>/<cesta> s <relativním jménem souboru hdlist>\n"
+"      removable://<cesta>\n"
+"\n"
+"a [volby] jsou z\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "používám asociované zdroje pro paralelní režim: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "připojuji %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - pokusí se najít a použít soubor se syntézou.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"nelze pracovat se zdrojem \"%s\", pokud je seznam souborů využíván jiným"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "nelze získat zdrojový balíček, končím"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - nepokoušet se hledat žádný soubor hdlist\n"
+"                   nebo soubor se syntézou.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
+"  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
+"                   média.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s dokončeno, ETA = %s, rychlost = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automaticky vytvoří médium pro část XXX\n"
+"                   distribuce, XXX může být main, contrib, updates nebo\n"
+"                   cokoli jiného co je nastaveno ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"počítám součet md5 získaného zdrojového souboru hdlist (nebo souboru se "
-"syntézou)"
+"  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - použije se zadaná verze distribuce, výchozí verze je "
+"převzata\n"
+"                   z verze instalovaného balíčku mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nikdy se neptat na odstranění balíčku, přerušit "
-"instalaci.\n"
+"  --arch         - použije se zadaná architektura, výchozí je arch.\n"
+"                   balíčku mandrake-release.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq verze %s\n"
-"Copyright ©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"
+"  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální,\n"
+"                   je povolen pouze protokol file://.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "načítám zdrojový hdlist (nebo soubor se syntézou) pro \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c           - smaže dočasný adresář.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "zdroj \"%s\" není vybrán"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f         - provede generování hdlist souborů.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Instalovat balíčky může pouze uživatel root"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nelze přidat aktualizace pro distribuci Cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "používá se specifické prostředí na %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "načítám zrcadla z %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nelze nalézt soubor hdlist pro \"%s\", zdroj bude ignorován"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "s volbou --distrib není třeba zadávat <relativní cesta k hdlistu>"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - malé velikost transakce, výchozí je %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nelze aktualizovat zdroj \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - levá závorka pro otevření skupiny výrazů.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativní cesta k hdlistu> chybí\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "výměnné médium \"%s\" má příliš mnoho přípojných bodů"
+msgid "`with' missing for network media\n"
+msgstr "chybí `with' pro síťový zdroj\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binární operátor AND, true pokud oba výrazy platí.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nelze vytvořit zdroj \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"nelze přistupovat ke zdroji \"%s\",\n"
-"což se může stát, pokud jste ručně připojili adresář při vytváření zdroje."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - vypíše tag skupina: group.\n"
+"použití: urpmi.removemedia [-a] <jméno> ...\n"
+"kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a           - vybere všechna média.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "nelze vytvořit transakci"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"neznámé volby '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "načítám rpm soubory ze zdroje \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nic k odebrání (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Vybrali jste balíček se zdroji:\n"
-"\n"
-"%s\n"
-"\n"
-"Tento balíček pravděpodobně nechcete na svém počítači instalovat\n"
-"(jeho instalace vám umožní provádět změny ve zdrojovém kódu programu\n"
-"a program překládat).\n"
-"\n"
-"Jak chcete pokračovat?"
+"záznam pro odebrání chybí\n"
+"(jeden z %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuuji %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"použití: urpmi.update [volby] <jméno> ...\n"
+"kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Chyba při instalaci"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - aktualizovat pouze aktualizační zdroje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapisuji soubor s nastavením [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - přinutí k aktualizaci klíče gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a           - vybere všechna nevyjímatelná média.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - vypíše tag epocha: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - zkontroluje před instalací signaturu balíčku RPM\n"
-"                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
+"záznam pro update chybí\n"
+"(jeden z %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verze %s\n"
+"Copyright ©2002 MandrakeSoft.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
+
+#: ../urpmq:53
 #, 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]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - vypíše balíčky, které jsou k dispozici.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - vypíše seznam dostupných zdrojů.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - vypíše seznam dostupných zdrojů a jejich url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - vnutit fuzzy vyhledávání (stejné jako --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - vypíše seznam uzlů k dispozici při použití volby --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "špatný popis hdlist \"%s\" v souboru hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "odstraňuje se %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extrahuje hlavičky pro balíček z urpmi db na std.\n"
+"                   výstup.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automaticky vytvoří médium pro část XXX\n"
-"                   distribuce, XXX může být main, contrib, updates nebo\n"
-"                   cokoli jiného co je nastaveno ;-)\n"
+"  --source     - všechny zdrojové balíčky před stažením (pouze uživatel "
+"root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - vypíše tag velikost: size.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - nastaví urpmi za provozu ze stromu distribuce.\n"
+"                   To umožní dotaz na distribuci.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "aby bylo možné zachovat %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - vytiskne změnový log.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "z důvodu nesplněného %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d               - rozšířený dotaz na závislosti balíčku.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatická instalace balíčků....\n"
-"Zadal jste instalaci balíčku %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "databáze pro urpmi je zamknutá"
+"  -u          - odebere balíček pokud je již instalována novější verze.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - obnoví stahování částečně stažených souborů\n"
-"                   (--no-resume obnovení zakáže, implicitně je zakázáno).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - doplnit výstup balíčkem k odebrání.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverzní vyhledávání požadavků balíčku.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "pokládám vyjímatelné médium za \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Chystáte se instalovat na váš počítač následující balíček se software:\n"
-"\n"
-"%s\n"
-"\n"
-"Možná chcete tento balíček pouze uložit. Jak chcete pokračovat?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r              - společně se jménem vypíše verzi a vydání.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy          - vnutit fuzzy vyhledávání. (stejné jako -y)\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - vypíše soubory v balíčku.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u          - odebere balíček pokud je již instalována novější verze.\n"
+"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - zkusí najít a použít soubor hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "volbu --list-nodes lze použít pouze s volbou --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "z důvodu chybějícího %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"použití: urpmi.update [volby] <jméno> ...\n"
-"kde <jméno> je název zdroje pro aktualizaci.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokus o vynechání existujícího zdroje \"%s\""
+#~ 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ů:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - zkontrolovat, zda lze dokončit instalaci správně.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq verze %s\n"
+#~ "Copyright ©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"
diff --git a/po/cy.po b/po/cy.po
index 518cdba9..b7dce57a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -35,878 +35,778 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "gosod %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
-"                   gosod\n"
+"Gosodiad pecynnau awtomatig...\n"
+"Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "methu agor rpmdb"
+msgid "Is this OK?"
+msgstr "Mae'r model yn gywir"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - argraffu neges cymorth.\n"
+msgid "Ok"
+msgstr "Iawn"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
+msgid "Cancel"
+msgstr "Dileu"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "tynnu pecyn %s."
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: heb ganfod gorchymyn\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"usage: %s [dewisiadau]\n"
+"lle mae [dewisiadau] o\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Popeth wedi eu gosod eisoes"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
+msgid "                    defaults is %s.\n"
+msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+msgid "unknown protocol defined for %s"
+msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Beth yw eich dewis? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "canfod %d pennawd mewn storfa"
+msgid "unable to handle protocol: %s"
+msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
-"                   dilysiad dirprw(fformat yw <user:password>).\n"
+"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "adfer ffeil rpm (%s)..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
+"ddefnyddio gan gyfrwng arall"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"methu defnyddio enw \"%s\" ar gyfer cyfrwng dienw am ei fod mewn defnydd "
+"eisoes"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "... methodd ail-lwytho: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"methu cymryd cyfrwng \"%s\" i ystyriaeth am nad oes rhestr ffeil [%s] yn "
+"bodoli"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Gosod pecynnau..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "enw ffeil rpm annilys [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
+"cyfrwng"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "methodd trosglwyddiad gosod %d"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
-"hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dewis gwael, ceisiwch eto\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Dewis lleoliad i gadw'r ffeil"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Ei osod"
+msgid "taking removable device as \"%s\""
+msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
-"                   X fodd testun.\n"
+msgid "write config file [%s]"
+msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Llwytho pecyn '%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "heb enwi pecyn %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
-"%s\n"
-"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+msgid "unable to use parallel option \"%s\""
+msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
+"--update neu --paralel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Nid oes modd i'r gosod parhau gan bo rhaid i'r pecynnau canlynol\n"
-"gael eu tynnu i eraill gael eu diweddaru.\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+msgid "examining hdlist file [%s]"
+msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
+msgid "performing second pass to compute dependencies\n"
+msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"%s"
+msgid "skipping package %s"
+msgstr "hepgor pecyn  %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"methu cymryd cyfrwng \"%s\" i ystyriaeth am nad oes rhestr ffeil [%s] yn "
-"bodoli"
+msgid "unable to open rpmdb"
+msgstr "methu agor rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
+msgid "virtual medium need to be local"
+msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgid "added medium %s"
+msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Cychwyn..."
+msgid "unable to access first installation medium"
+msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
+msgid "copying hdlists file..."
+msgstr "copïo ffeil hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - argraffu pob tag.\n"
+msgid "...copying failed"
+msgstr "...methodd y copïo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
+msgid "...copying done"
+msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
-"cyfrwng"
+"methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "adfer ffeil hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
+msgid "...retrieving done"
+msgstr ".cwblhau adfer"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pwyso Enter pan yn barod..."
+msgid "...retrieving failed: %s"
+msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
-"cael\n"
-"                   eu gosod neu eu uwchraddio\n"
-"                   rhagosodiad yw %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
+msgid "removing medium \"%s\""
+msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "adeiladu hdlist [%s]"
+"maethu cael mynediad i gyfrwng \"%s\",\n"
+"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
-"                   pecynnau sy'n arwain at dynnu.\n"
+"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
+"anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "archwilio ffeil MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: heb ganfod gorchymyn\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "methu cofrestr ffeil rpm"
+msgid "examining MD5SUM file"
+msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
-"                   wirio dibyniaethau.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "methu trin protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "adfer ffeil hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Iawn, yn barod i'w osod"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "ychwanegwyd cyfrwng %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
+msgid "reading rpm files from [%s]"
+msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "anghysondeb md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "gwall cystrawen yn ffeil ffurfweddiad yn llinell %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
-"eu gosod.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
-"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "er mwyn gosod %s"
+msgid "md5sum mismatch"
+msgstr "anghysondeb md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ailganfod cofnodion %s yn depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "gosod yn lle uwchraddio pecyn %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "adfer drychau yn %s..."
+msgid "unable to write list file of \"%s\""
+msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol anhysbys ar gyfer %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
-"niferus).\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "cyfrwng \"%s\" yn bodoli eisoes"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "gosod %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mae'r cofnod i ddiweddaru ar goll\n"
-"(un o %s)\n"
+msgid "building hdlist [%s]"
+msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "ceisio hybu %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "methu tynnu pecyn %s"
+msgid "found %d headers in cache"
+msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mae'r cofnod i'w dynnu ar goll\n"
-"(un o %s)\n"
+msgid "mounting %s"
+msgstr "gosod %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - dewis pob cyfrwng.\n"
+msgid "unmounting %s"
+msgstr "dadosod %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Llofnod coll (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "ailganfod cofnodion %s yn depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "methu darllen ffeiliau rpm o (%s): %s"
+msgid "no entries relocated in depslist"
+msgstr "dim cofnodion wedi eu symud i depslip"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "unable to register rpm file"
+msgstr "methu cofrestr ffeil rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - cyfyngu canlyniadau i'r grwp.\n"
+msgid "error registering local packages"
+msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
+msgid "no package named %s"
+msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "allbwn gwallus: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "bydd tynnu pecynnau %s yn torri'r system"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
+"  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "dim cofnodion wedi eu symud i depslip"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+msgid "package %s is not found."
+msgstr "heb ganfod pecyn %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
+msgid "urpmi database locked"
+msgstr "cronfa ddata urmi wedi cloi"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "cytuno?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr ".cwblhau adfer"
+msgid "unable to access medium \"%s\""
+msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "hepgor pecyn  %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Llofnod annilys (%s)"
+msgid "Preparing..."
+msgstr "Paratoi..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
-"eu holi.\n"
+msgid "using process %d for executing transaction"
+msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi fersiwn %s\n"
-"Hawlfraint © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "methu enw cyfrwng y ffeil hdlist hon (%s)"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "methu didoli ffeil hdlist \"%s\""
+"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
+msgid "unable to create transaction"
+msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "oherwydd gwrthdaro gyda %s"
+msgid "removing package %s"
+msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "tynnu hen benawdau %d yn y storfa"
+msgid "unable to remove package %s"
+msgstr "methu tynnu pecyn %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "methu diweddaru cyfrwng \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+msgid "unable to install package %s"
+msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                   rhagosodedig yw %s.\n"
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "defnyddio dyfais symudol wahanol (%s) ar gyfer \"%s\""
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
-"                   ffeil hdlist.\n"
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
+msgid "due to conflicts with %s"
+msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "methodd copïo (%s) (md5sum gwallus)"
+msgid "unrequested"
+msgstr "diofyn"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
-"                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
+msgid "Invalid signature (%s)"
+msgstr "Llofnod annilys (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"usage: %s [dewisiadau]\n"
-"lle mae [dewisiadau] o\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
+msgid "Missing signature (%s)"
+msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"methu defnyddio enw \"%s\" ar gyfer cyfrwng dienw am ei fod mewn defnydd "
-"eisoes"
+msgid "bad proxy declaration on command line\n"
+msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
-"anwybyddu'r cyfrwng"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -922,662 +822,718 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...cwblhau'r copïo"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "methu defnyddio dewis paralel \"%s\""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
+"bodoli.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
-"  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
+"  --paralel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "error registering local packages"
-msgstr "gwall cofrestru pecynnau lleol"
+msgid "  -v             - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:50
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
+msgid "unknown package"
+msgstr "pecyn anhysbys"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "heb ganfod ffeiliau rpm o [%s]"
+msgid "removing package %s will break your system"
+msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
+msgid "Nothing to remove"
+msgstr "Dim i'w dynnu"
 
-#: ../urpmi:1
+#: ../urpme:99
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+msgid "Checking to remove the following packages"
+msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "unable to install package %s"
-msgstr "methu gosod pecyn %s"
+msgid "removing %s"
+msgstr "tynnu %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "Methodd y tynnu"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
-"                   wirio dibyniaethau na'u cyfanrwydd.\n"
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Cadw ffeil"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Enw Allwedd Annilys (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
-"bodoli.\n"
+"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn\n"
+"                    cael ei roi ar y linell orchymyn gyda modd "
+"rhyngweithiol).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - argraffu pob tag.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - argraffu grwp tag: grwp.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - argraffu maint tag: maint.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<llwybr perthynnol hdlist> ar goll\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ticio i ddileu'r pecynnau canlynol"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "diofyn"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "methu cael mynediad  ffeil rpm (%s)"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ydych chi am barhau gosod?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - argraffu tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth gosod chroot gyda dewis o  --root.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - argraffu fagiau ffeiliau: pob ffeil\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
-"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
-"i bobl.\n"
+"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
+"niferus).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - defnyddiwch fersiwn penodol i'r dosbarthiad, mae'r "
-"rhagosodiad\n"
-"                   yn cael ei gymryd ofersiwn dosbarthiad hysbyswyd gan "
-"pecynnau\n"
-"                   ryddhawyd gan Mandrake.\n"
+"  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
+"                   fel rheol.\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
-"rhagosodedig yw\n"
-"                   %s\n"
+"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
+"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+"gywir.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
-"adroddiad gwall neu ei ddileu."
+"galw nôl yw: \n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "dadosod %s"
+msgid "using specific environment on %s\n"
+msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% wedi cwblhau, cyflymder = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi fersiwn %s\n"
+"Hawlfraint © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "ailgychwyn urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "archwilio ffeil synthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...methodd y copïo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
+"                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
+"cael\n"
+"                   eu gosod neu eu uwchraddio\n"
+"                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modd distaw.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
-"                   stdout (gwraidd yn unig).\n"
+"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "dewis aml-gyfrwng: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - caniatáu gofyn i ddefnyddiw osod pecynnau heb\n"
+"                   wirio dibyniaethau.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
+"                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth gosod chroot gyda dewis o  --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help     - argraffu neges cymorth.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "canfod trinydd paralel ar gyfer nodau: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"galw nôl yw: \n"
-"%s\n"
+"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
+"                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
-"\n"
-"defnydd:\n"
+"  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
+"                   dilysiad dirprw(fformat yw <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn\n"
-"                    cael ei roi ar y linell orchymyn gyda modd "
-"rhyngweithiol).\n"
+"  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
+"                   yr arg. nesaf\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - peidio argraffu llinellau yr un fath.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
-"--update neu --paralel"
+"  --best-output  - dewiswch y rhyngwyneb gorau yn ôl yr amgylchedd:\n"
+"                   X fodd testun.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
-"o\n"
-"                   osod pecynnau Mandrake.\n"
+"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Mae'r model yn gywir"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "archwilio trinydd paralel mewn ffeil [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - caniatáu i chwilio ganfod pecyn.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Dim i'w dynnu"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "darllen pennawd o'r cyfrwng \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
-"                   yr arg. nesaf\n"
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu gosod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
+msgid "Choose location to save file"
+msgstr "Dewis lleoliad i gadw'r ffeil"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Rydych wedi dewis pecyn ffynhonnell:\n"
+"\n"
+"%s\n"
+"\n"
+"Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur(bydd\n"
+"ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonell a'i grynhoi).\n"
+"\n"
+"Beth hoffech chi ei wneud?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+msgid "Do nothing"
+msgstr "Gwneud dim"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
+msgid "Yes, really install it"
+msgstr "Iawn, yn barod i'w osod"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgid "Save file"
+msgstr "Cadw ffeil"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Methodd y copïo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
+"\n"
+"%s\n"
+"\n"
+"Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
+msgid "Install it"
+msgstr "Ei osod"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
+"adroddiad gwall neu ei ddileu."
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
+msgid "Copying failed"
+msgstr "Methodd y copïo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "gosod %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "darllen ffeiliau rpm o [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copïo ffeil disgrifiad o \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
+msgid "Package installation..."
+msgstr "Gosod pecynnau..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Methodd y tynnu"
+msgid "Initializing..."
+msgstr "Cychwyn..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
-"                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "heb ganfod pecyn %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "dewis cyfrwng \"%s\":"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
+"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
+msgid "do you agree ?"
+msgstr "cytuno?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --env          - defnyddio amgynlchedd benodol (adroddiad gwall \n"
-"                   fel rheol.\n"
+"Nid oes modd i'r gosod parhau gan bo rhaid i'r pecynnau canlynol\n"
+"gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "methu cael mynediad at gyfrwng. \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "methu creu cyfrwng \"%s\"\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s"
 
-#: ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
-"addmedia.\n"
+"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1586,382 +1542,430 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - cofnod argraffu.\n"
+msgid "unable to get source packages, aborting"
+msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parenthesis de i gau mynegiad grwp.\n"
+msgid "Press Enter when ready..."
+msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
+msgid "Downloading package `%s'..."
+msgstr "Llwytho pecyn '%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "archwilio ffeil hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copïo ffeil hdlists..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi cwblhau, cyflymder = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
+msgid "Do you want to continue installation ?"
+msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
+"%s\n"
+"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Gwneud dim"
+msgid "Installation failed"
+msgstr "Methodd y gosod"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
+msgid "distributing %s"
+msgstr "dosbarthu %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
+msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"methu cymryd gofal o gyfrwng \"%s\" gan fod y rhestr ffeil yn cael ei "
-"ddefnyddio gan gyfrwng arall"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "methu estyn pecynnau ffynhonnell, atal"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+msgid "%d installation transactions failed"
+msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "methu mewnforio ffeil pubkey \"%s\""
+msgid "Everything already installed"
+msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
+msgid "restarting urpmi"
+msgstr "ailgychwyn urpmi"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq fersiwn %s\n"
-"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"defnydd:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
+"and [options] are from\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "heb ddewis cyfrwng \"%s\""
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "ddefnyddio amgylchedd penodol ar %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - peidio ceisio canfod unrhyw synthesis neu\n"
+"                   ffeil hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
+"                   gosod\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - creu cyfrwng yn awtomatig ar gyfer rhan  XXX o'r\n"
+"                   dosbarthiad, gall  XXX fod yn main, contrib, diweddariad "
+"neu\n"
+"                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parenthesis chwith i agor mynegiad grwp.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
+"rhagosodedig yw\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - defnyddiwch fersiwn penodol i'r dosbarthiad, mae'r "
+"rhagosodiad\n"
+"                   yn cael ei gymryd ofersiwn dosbarthiad hysbyswyd gan "
+"pecynnau\n"
+"                   ryddhawyd gan Mandrake.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+"  --arch         - defnyddio pensaerhiaeth ppenodol, y rhagosodiad yw arch "
+"o\n"
+"                   osod pecynnau Mandrake.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"maethu cael mynediad i gyfrwng \"%s\",\n"
-"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
+"  --virtual      - creu cyfrwng rhithil sydd wedi ei ddiweddaru,\n"
+"                   dom ond protocol ffeil:// sy'n cael ei ganiatau.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - argraffu grwp tag: grwp.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan coma.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "methu creu trosglwyddiad."
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Rydych wedi dewis pecyn ffynhonnell:\n"
-"\n"
-"%s\n"
-"\n"
-"Mwy na thebyg doeddech ddim am ei osod ar eich cyfrifiadur(bydd\n"
-"ei osod yn caniatáu i chi wneud newidiadau i'w cod ffynhonell a'i grynhoi).\n"
-"\n"
-"Beth hoffech chi ei wneud?"
+msgid "retrieving mirrors at %s ..."
+msgstr "adfer drychau yn %s..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "dosbarthu %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+msgid "unable to update medium \"%s\"\n"
+msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "ysgrifennu ffeil ffurfweddu (%s)"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "methu creu cyfrwng \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - dewis pob cyfrwng.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"dewisiadau anhysbys '%s'\n"
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"mae'r cofnod i'w dynnu ar goll\n"
+"(un o %s)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "Ok"
-msgstr "Iawn"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"usage: urpmi.update [options] <name> ...\n"
+"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:38
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:40
 #, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
+
+#: ../urpmi.update:41
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
+
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --distrib-XXX  - creu cyfrwng yn awtomatig ar gyfer rhan  XXX o'r\n"
-"                   dosbarthiad, gall  XXX fod yn main, contrib, diweddariad "
-"neu\n"
-"                   unrhywwbeth arall sydd wedi ei ffurfweddu ;-)\n"
+"mae'r cofnod i ddiweddaru ar goll\n"
+"(un o %s)\n"
 
-#: ../urpmf:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"\n"
+"defnydd:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - argraffu maint tag: maint.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
-msgstr "fel modd i gadw %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s heb ei foddloni"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "cronfa ddata urmi wedi cloi"
+"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
+"addmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
+"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "archwilio ffeil pubkey \"%s\""
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - tynnu penawdau o bechyn yn urpmii db i\n"
+"                   stdout (gwraidd yn unig).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "cymryd dyfais symudol fel \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - give all source packages before downloading (root only).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
-"\n"
-"%s\n"
-"\n"
-"Efallai byddai'n well gennych eu cadw. Beth yw eich dewis?"
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
+"                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - cofnod argraffu.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1970,37 +1974,79 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "oherwydd %s coll"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
+"i bobl.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"usage: urpmi.update [options] <name> ...\n"
-"lle mai <name> yw'r ewn cyfrwng i'w dynnu.\n"
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu holi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq fersiwn %s\n"
+#~ "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL "
+#~ "GNU..\n"
+#~ "\n"
+#~ "defnydd:\n"
diff --git a/po/da.po b/po/da.po
index 4fd42359..1be1e70e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-06 09:28+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -42,866 +42,775 @@ msgstr "YyJj"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
+"Automatisk installation af pakker...\n"
+"Du bestilte installation af pakke %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "kunne ikke åbne rpmdb"
+msgid "Is this OK?"
+msgstr "Er det o.k.?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - udskriv denne hjælpebesked.\n"
+msgid "Ok"
+msgstr "O.k."
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Annullér"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "fjerner pakke %s"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: kommando ikke fundet\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kan ikke bruge parallel-tilstand med 'use-distrib '-tilstand"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"brug: %s [tilvalg]\n"
+"hvor [tilvalg] er fra\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "alting er allerede installeret"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - udskriv denne hjælpebesked.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rydder katalog med cache for headere.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  -g [group}     - begræns resultater til denne gruppe.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "bruger proces %d for at udføre transaktion"
+msgid "                    defaults is %s.\n"
+msgstr "                    standard er %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - skriv mærke-tilbud: alle tilbud.\n"
+msgid "unknown protocol defined for %s"
+msgstr "ukendt protokol defineret for %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvad er dit valg? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "fandt %d hoveder i hurtiglager"
+msgid "unable to handle protocol: %s"
+msgstr "kunne ikke behandle protokol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaksfejl i config fil ved linje %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - angiv bruger og adgangskode til brug for kontrol\n"
-"                   af proxy (formatet er <bruger:adgangskode>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medie \"%s\" prøver at bruge en allerede brugt hdlist, medie ignoreret"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "udfører andet gennemløb for at beregne afhængigheder\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "medie \"%s\" prøver at bruge en allerede brugt liste, medie ignoreret"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "henter rpm-fil [%s]..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kan ikke behandle medie \"%s\" da listefil allerede bliver brugt af et andet "
+"medie"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list tilgængelige parallelle aliaser.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"Kunne ikke bruge navnet '%s' for navnløst medium fordi det allerede er brugt"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hentning mislykkedes: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"kunne ikke tage medie \"%s\" i beregning da ingen listefil [%s] eksisterer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspicere listefil for \"%s\", medie ignoreret"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme medie for denne hdlist-fil [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binær ELLER-operator, sand hvis et udtryk er sandt.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke nå hdlist-fil af \"%s\", medie ignoreret"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Pakkeinstallation..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan ikke få adgang til filen \"%s\", medie ignoreret"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ugyldigt rpm-filnavn [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "prøver at forbigå eksisterende medie \"%s\", undgår"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Forkert proxy-erklæring på kommandolinje\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"det virtuelle medie \"%s\" bør ikke have defineret en hdlist- eller list-"
+"fil, medie ignoreret"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installationstrasaktioner mislykkedes"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuelt medie \"%s\" bør have en klar url, medie ignoreret"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"kunne ikke få fat på det første installationsmedium (ingen Mandrake/base/"
-"hdlists fil fundet)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finde hdlist-fil for \"%s\", medie ignoreret"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Undskyld, dårligt valg, prøv igen\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finde listefil for \"%s\", medie ignoreret"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Vælg sted at gemme filen"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "inkonsistent listefil for \"%s\", medie ignoreret"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - skriv mærke-resumé: resumé.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspicere listefil for \"%s\", medie ignoreret"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Følgende pakker indeholder %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Installér den"
+msgid "taking removable device as \"%s\""
+msgstr "tager udskifteligt medium som \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - brug X-grænsesnit.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Der er brug for en af de følgende pakker:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"For at tilfredsstille afhængigheder vil de følgende pakker blive fjernet (%d "
-"Mb)"
+msgid "unable to write config file [%s]"
+msgstr "kunne ikke skrive config-fil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - vælg bedste grænsesnit svarende til miljøet:\n"
-"                   X- eller tekst-udgave.\n"
+msgid "write config file [%s]"
+msgstr "skriver config fil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Henter pakke %s..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kan ikke bruge parallel-tilstand med 'use-distrib '-tilstand"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Hvad der kan gøres med binære rpm-filer ved brug af --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "kunne ikke tolke '%s' i fil [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "undersøger parallelbehandling i fil [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "ingen pakke kaldet %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "fandt parallelbehandling for knuder: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vælg alle træffere på kommandolinje.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "bruger tilknyttet medie for parallel tilstand: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installationen mislykkedes, nogle filer mangler:\n"
-"%s\n"
-"Du ønsker måske at opdatere din urpmi-database"
+msgid "unable to use parallel option \"%s\""
+msgstr "kan ikke bruge parallel mulighed \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"brug: urpmi.removemedia [-a] <navn> ...\n"
-"hvor <navn> er et medie-navn der skal fjernes.\n"
+"--synthesis kan ikke bruges med --media, --excludemedia, --sortmedia, --"
+"update eller --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Installationen kan ikke fortsætte fordi de følgende pakker\n"
-"skal fjernes for at andre kan opgraderes:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "undersøger syntese-fil [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "'with' mangler for netværks-medie\n"
+msgid "examining hdlist file [%s]"
+msgstr "undersøger hdlist-fil [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l..          - udskriv filer i pakken.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuelt medie \"%s\" er ikke lokalt, medie ignoreret"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "ukendt pakke"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem ved læsning af hdlist- eller syntese-fil for medie \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Installation er mulig"
+msgid "performing second pass to compute dependencies\n"
+msgstr "udfører andet gennemløb for at beregne afhængigheder\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "overspringer pakke %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret "
-"(%d Mb)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "ville installere i stedet for at opgradere pakke %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kunne ikke tage medie \"%s\" i beregning da ingen listefil [%s] eksisterer"
+msgid "unable to open rpmdb"
+msgstr "kunne ikke åbne rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medie \"%s\" eksisterer allerede"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan ikke tilføje opdateringer af en cooker-distribution\n"
+msgid "virtual medium need to be local"
+msgstr "virtuelt medie skal være lokalt"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - udførlig tilstand.\n"
+msgid "added medium %s"
+msgstr "tilføjede medie %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "unable to access first installation medium"
+msgstr "kan ikke få adgang til første installationsmedium"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - skriv tilgængelige pakker.\n"
+msgid "copying hdlists file..."
+msgstr "kopierer hdlists-fil..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - skriv alle mærker.\n"
+msgid "...copying failed"
+msgstr "...kopiering mislykkedes"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
+msgid "...copying done"
+msgstr "...kopiering færdig"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"det virtuelle medie \"%s\" bør ikke have defineret en hdlist- eller list-"
-"fil, medie ignoreret"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "beregner md5sum på kopieret kilde-hdlist (eller -syntese)"
+"kunne ikke få fat på det første installationsmedium (ingen Mandrake/base/"
+"hdlists fil fundet)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
+msgid "retrieving hdlists file..."
+msgstr "henter hdlists-fil..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Tryk på retur, når den er klar..."
+msgid "...retrieving done"
+msgstr "...hentning færdig"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukendte valg '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...hentning mislykkedes: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - opdél i lille transaktion hvis mere end givne pakker\n"
-"                       skal installeres eller opgraderes,\n"
-"                       standard er %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "ugyldig hdlist beskrivelse '%s' i hdlists-fil"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem ved læsning af hdlist- eller syntese-fil for medie \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - brug wget til at hente eksterne filer.\n"
+msgid "selecting multiple media: %s"
+msgstr "vælger flere medier: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - tillad søgning i 'provides' for at finde pakke.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - list tilgængelige knuder ved brug af --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "fjerner medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bygger hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"Kan ikke tilgå medie '%s',\n"
+"dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - behold eksisterende pakker om muligt, afvis anmodede\n"
-"                   pakker som fører til fjernelse.\n"
+"virtuelt medie \"%s\" burde have gyldig kilde-hdlist eller -syntese, medie "
+"ignoreret"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "undersøger MD5SUM-fil"
+msgid "copying description file of \"%s\"..."
+msgstr "kopierer beskrivelsesfil for \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: kommando ikke fundet\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "beregner md5sum på eksisterende kilde-hdlist (eller -syntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "kunne ikke registrere rpm-fil"
+msgid "examining MD5SUM file"
+msgstr "undersøger MD5SUM-fil"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - tillad at spørge bruger om installering af pakker uden "
-"kontrol af\n"
-"                   afhængigheder.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopierer kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kunne ikke behandle protokol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "henter hdlists-fil..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "beregner md5sum på kopieret kilde-hdlist (eller -syntese)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ja, installér det virkelig"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopi af [%s] mislykkedes (md5sum-uoverensstemmelse)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "tilføjede medie %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem ved læsning af syntese-fil for medie \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - behold rpm ikke brugt i cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "læser rpm-filer fra [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
-"opgradér=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kunne ikke læse rpm-filer fra  [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum: passer ikke"
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm filer fundet fra [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaksfejl i config fil ved linje %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "fandt undersøgte hdlist (eller syntese) for \"%s\"..."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - brug den angivne HTTP proxy, portnummeret antages at\n"
-"                   være 1080 som standard (formatet er <proxyvært[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "beregner md5sum på hentet kilde-hdlist (eller -syntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "for at kunne installere %s"
+msgid "md5sum mismatch"
+msgstr "md5sum: passer ikke"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "omflyttede %s indgange i depsliste"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "hentning af kilde-hdlist (eller -syntese) mislykkedes"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignorér forskel på store og små bogstaver i alle "
-"mønstre.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil fundet for medie \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fil [%s] er allerede brugt på det samme medie \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ville installere i stedet for at opgradere pakke %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "kunne ikke fortolke hdlist-filen \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "henter spejle på %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "kunne ikke skrive listefil for \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url           - skriv mærke-url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "skriver liste-fil for medie \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ukendt protokol defineret for %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "ingenting skrevet i listefil for \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - udskriv også version og udgave med navn.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "undersøger pubkey-fil for '%s'"
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - skriv mærke-forældede: alle forældede.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medie \"%s\" eksisterer allerede"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "kunne ikke importere pubkey-fil for \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "læser hoveder fra medium \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mangler det element der skal opdateres\n"
-"(én af %s)\n"
+msgid "building hdlist [%s]"
+msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "prøver at fremme %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "byggede hdlist syntese fil for medie \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kan ikke fjerne pakke %s"
+msgid "found %d headers in cache"
+msgstr "fandt %d hoveder i hurtiglager"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem ved læsning af syntese-fil for medie \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d forældede hoveder i hurtiglager"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mangler det element der skal fjernes\n"
-"(én af %s)\n"
+msgid "mounting %s"
+msgstr "monterer %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - vælg alle medier.\n"
+msgid "unmounting %s"
+msgstr "afmonterer %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Manglende signatur (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "omflyttede %s indgange i depsliste"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kunne ikke læse rpm-filer fra  [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "ingen indgange omflyttede i depsliste"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "henter rpm-fil [%s]..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - opdatér kun opdateringsmedie.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "kunne ikke nå rpm fil [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "unable to register rpm file"
+msgstr "kunne ikke registrere rpm-fil"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  -g [group}     - begræns resultater til denne gruppe.\n"
+msgid "error registering local packages"
+msgstr "fejl ved registrering af lokale pakker"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medie \"%s\" prøver at bruge en allerede brugt liste, medie ignoreret"
+msgid "no package named %s"
+msgstr "ingen pakke kaldet %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "misdannet inddata: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker indeholder %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "fjernelse af pakke %s vil skade dit system"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - list tilgængelige medier.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kunne ikke fortolke [%s] korrekt ved værdi \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Nogen forespurgte pakker kan ikke installeres:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
+"medie \"%s\" bruger en ugyldig listefil:\n"
+"  spejlet er nok ikke opdateret, prøver at bruge en anden metode"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ingen indgange omflyttede i depsliste"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medie \"%s\" definerer ikke noget sted for rpm-filer"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installér kun kildepakker (ingen binære).\n"
+msgid "package %s is not found."
+msgstr "pakke %s er ikke fundet."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-database låst"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medie \"%s\" er ikke valgt"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Er du enig?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke læse rpm-fil [%s] fra medie \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "inkonsistent listefil for \"%s\", medie ignoreret"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...hentning færdig"
+msgid "unable to access medium \"%s\""
+msgstr "kunne ikke nå medie \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "tilføjer pakke %s (id=%d, eid=%d, opdatering=%d, fil=%s)"
+msgid "malformed input: [%s]"
+msgstr "misdannet inddata: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "overspringer pakke %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "henter rpm-filer fra medie '%s'..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ugyldig signatur (%s)"
+msgid "Preparing..."
+msgstr "Forbereder..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
+msgid "using process %d for executing transaction"
+msgstr "bruger proces %d for at udføre transaktion"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi version %s\n"
-"Ophavsret © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kunne ikke fortolke [%s] korrekt ved værdi \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bestemme medie for denne hdlist-fil [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "kunne ikke fortolke hdlist-filen \"%s\""
+"oprettede transaktion for installering på %s (fjern=%d, installér=%d, "
+"opgradér=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "medie \"%s\" prøver at bruge en allerede brugt hdlist, medie ignoreret"
+msgid "unable to create transaction"
+msgstr "kan ikke oprette transaktion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "grundet modstrid med %s"
+msgid "removing package %s"
+msgstr "fjerner pakke %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d forældede hoveder i hurtiglager"
+msgid "unable to remove package %s"
+msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kan ikke opdatere medie \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "tilføjer pakke %s (id=%d, eid=%d, opdatering=%d, fil=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
+msgid "unable to install package %s"
+msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuelt medie \"%s\" er ikke lokalt, medie ignoreret"
+msgid "due to missing %s"
+msgstr "grundet manglende %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Forbereder..."
+msgid "due to unsatisfied %s"
+msgstr "grundet uopfyldt %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    standard er %s.\n"
+msgid "trying to promote %s"
+msgstr "prøver at fremme %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
+msgid "in order to keep %s"
+msgstr "for at kunne beholde %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
+msgid "in order to install %s"
+msgstr "for at kunne installere %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - søg ikke i 'provides' for at finde pakke.\n"
+msgid "due to conflicts with %s"
+msgstr "grundet modstrid med %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopi af [%s] mislykkedes (md5sum-uoverensstemmelse)"
+msgid "unrequested"
+msgstr "ikke ønsket"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ.\n"
-"              Dette muliggør at spørge efter en distro.\n"
+msgid "Invalid signature (%s)"
+msgstr "Ugyldig signatur (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"brug: %s [tilvalg]\n"
-"hvor [tilvalg] er fra\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Ugyldig nøgle-id (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - fjern rpm fra cache før noget andet.\n"
+msgid "Missing signature (%s)"
+msgstr "Manglende signatur (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"Kunne ikke bruge navnet '%s' for navnløst medium fordi det allerede er brugt"
+msgid "bad proxy declaration on command line\n"
+msgstr "Forkert proxy-erklæring på kommandolinje\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - skriv mærke-konflikter: alle konflikter.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuelt medie \"%s\" burde have gyldig kilde-hdlist eller -syntese, medie "
-"ignoreret"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Undskyld, dårligt valg, prøv igen\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -917,1077 +826,1214 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"brug: urpmi.addmedia [--update] <navn> <url> [with <relativ sti>]\n"
-"hvor <url> er en af\n"
-"       file://<sti>\n"
-"       ftp://<login>:<adgangskode>@<vært>/<sti> with <relativt filnavn for "
-"hdlist>\n"
-"       ftp://<vært>/<sti> with <relativt filnavn for hdlist>\n"
-"       http://<vært>/<sti> with <relativt filnavn for hdlist>\n"
-"       removable://<sti>\n"
-"\n"
-"og [valgmuligheder] er følgende\n"
-
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopierer kilde-hdlist (eller -syntese) for \"%s\"..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - udskriv denne hjælpebesked.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "...kopiering færdig"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "kan ikke bruge parallel mulighed \"%s\""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - afprøv om installationen kan udføres korrekt.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"medie \"%s\" bruger en ugyldig listefil:\n"
-"  spejlet er nok ikke opdateret, prøver at bruge en anden metode"
+"  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "kan ikke få adgang til første installationsmedium"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuelt medie skal være lokalt"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - brug en anden root for rpm-installation.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
-msgstr "fejl ved registrering af lokale pakker"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurér urpmi løbende fra et distrib træ, "
+"nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - begræns hastighed på hentning.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "fandt undersøgte hdlist (eller syntese) for \"%s\"..."
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "hentning af kilde-hdlist (eller -syntese) mislykkedes"
+msgid "unknown packages"
+msgstr "ukendte pakker"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm filer fundet fra [%s]"
+msgid "unknown package"
+msgstr "ukendt pakke"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ingenting skrevet i listefil for \"%s\""
+msgid "removing package %s will break your system"
+msgstr "fjernelse af pakke %s vil skade dit system"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "De følgende pakker har dårlige signaturer"
+msgid "Nothing to remove"
+msgstr "Ingenting at fjerne"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "beregner md5sum på eksisterende kilde-hdlist (eller -syntese)"
+msgid "Checking to remove the following packages"
+msgstr "Tjekker for at fjerne de følgende pakker"
 
-#: ../urpmq:1
+#: ../urpme:106
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - færdiggør uddata med pakke der skal fjernes.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive fjernet (%d "
+"Mb)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to install package %s"
-msgstr "kunne ikke installere pakke %s"
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
+msgid "removing %s"
+msgstr "fjerner %s"
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "Fjernelse mislykkedes"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - tillad at spørge bruger om installering af pakker\n"
-"                   uden kontrol af afhængigheder og integritet.\n"
+"urpmf version %s\n"
+"Ophavsret © 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Gem fil"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - brug kun opdateringsmedie.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - brug kun de opgivne medier, adskilt med komma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kunne ikke skrive config-fil [%s]"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - brug ikke de opgivne medier, adskilt med komma.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ugyldig nøgle-id (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - udførlig tilstand.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - gennemfør kald selv om nogen pakker ikke eksisterer.\n"
+"  --quiet         - skriv ikke mærkenavn (standard hvis intet mærke angivet "
+"på\n"
+"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - skriv alle mærker.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - skriv mærkegruppe: gruppe.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativ sti for hdlist> mangler\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Tjekker for at fjerne de følgende pakker"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - skriv mærke-resumé: resumé.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "ikke ønsket"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - skriv mærke-beskrivelse: beskrivelse.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kunne ikke nå rpm fil [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm     - skriv mærke for kilde-rpm: kilde-rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - skriv mærke-filer: alle filer.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager      - skriv mærke-pakker: pakker.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "kunne ikke tolke '%s' i fil [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost     - skriv mærke-byggevært: byggevært.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ønsker du at fortsætte installationen?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url           - skriv mærke-url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke læse rpm-fil [%s] fra medie \"%s\""
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - skriv mærke-tilbud: alle tilbud.\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ, "
-"nyttigt               til at installere en chroot med --root-tilvalget.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - skriv mærke-krav: alle krav.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "byggede hdlist syntese fil for medie \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - skriv mærke-filer: alle filer.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - udskriv nyttig information på læsevenlig form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - skriv mærke-konflikter: alle konflikter.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - skriv mærke-forældede: alle forældede.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --version      - brug angivet distributionsversion, standard tages fra\n"
-"                   versionen af distributionen indikeret ved den\n"
-"                   installerede mandrake-release pakke.\n"
+"  -i             - ignorér forskel på store og små bogstaver i alle "
+"mønstre.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - brug angivet adresse for liste over spejl, standard er\n"
-"                   %s\n"
+"  -a             - binær OG-operator, sand hvis begge udtryk er sande.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - konfigurér urpmi løbende fra et distrib træ, "
-"nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
+"  -o             - binær ELLER-operator, sand hvis et udtryk er sandt.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - negation, sand hvis udtryk er falsk.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - venstreparantes for at åbne gruppeudtryk.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  (              - højreparantes for at lukke gruppeudtryk.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
-"fejlrapporten, eller slet det"
+"tilbagekald er :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "afmonterer %s"
+msgid "using specific environment on %s\n"
+msgstr "bruger særligt miljø på %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% færdig, hastighed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Ophavsret © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "genstarter urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "undersøger syntese-fil [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - vælg automatisk pakker for opgradering af systemet.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prøv installation med endnu større kraft (--force)? (j/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - spørg aldirig om afinstallering af en pakke, afbryd "
+"installationen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiering mislykkedes"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - behold eksisterende pakker om muligt, afvis anmodede\n"
+"                   pakker som fører til fjernelse.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke nå hdlist-fil af \"%s\", medie ignoreret"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - opdél i lille transaktion hvis mere end givne pakker\n"
+"                       skal installeres eller opgraderes,\n"
+"                       standard er %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stille udgave.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - lille tansaktionslængde, standard er %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - udførlig tilstand.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - gennemfør søgning efter fuzzy (samme som -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - giv alle kildepakker før hentning (kun root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - næste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - udtræk headere for pakke listet fra urpmi-db til\n"
-"                   stdud (kun root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installér kun kildepakker (ingen binære).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "ukendte pakker"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - fjern rpm fra cache før noget andet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "vælger flere medier: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - behold rpm ikke brugt i cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - tillad at spørge bruger om installering af pakker uden "
+"kontrol af\n"
+"                   afhængigheder.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fil [%s] er allerede brugt på det samme medie \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - tillad at spørge bruger om installering af pakker\n"
+"                   uden kontrol af afhængigheder og integritet.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilføje et medie)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ, "
+"nyttigt               til at installere en chroot med --root-tilvalget.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finde listefil for \"%s\", medie ignoreret"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - brug wget til at hente eksterne filer.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - udskriv denne hjælpebesked.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "fandt parallelbehandling for knuder: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - begræns hastighed på hentning.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"tilbagekald er :\n"
-"%s\n"
+" --resume       - genoptag overførsel af delvist hentede filer\n"
+"                   (--no-resume deaktiverer det, standard er deaktiveret).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omvendt søgning til hvad der kræver pakke.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - brug den angivne HTTP proxy, portnummeret antages at\n"
+"                   være 1080 som standard (formatet er <proxyvært[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf version %s\n"
-"Ophavsret © 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug:\n"
+"  --proxy-user   - angiv bruger og adgangskode til brug for kontrol\n"
+"                   af proxy (formatet er <bruger:adgangskode>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - skriv ikke mærkenavn (standard hvis intet mærke angivet "
-"på\n"
-"                    kommandolinjen, inkompatibel med interaktiv tilstand).\n"
+"  --bug          - udskriv en fejlrapport i et katalog angivet i næste\n"
+"                   argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - brug X-grænsesnit.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis kan ikke bruges med --media, --excludemedia, --sortmedia, --"
-"update eller --parallel"
+"  --best-output  - vælg bedste grænsesnit svarende til miljøet:\n"
+"                   X- eller tekst-udgave.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - brug angivet arkitektur, standard er arkitekturen af\n"
-"                   mandrake-release pakken installeret.\n"
+"  --verify-rpm   - kontrollér rpm-signatur før installation.\n"
+"                   (--no-verify-rpm deaktiverer det, standard er "
+"aktiveret).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Er det o.k.?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - udelukkelsessti adskilt med komma.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - udelader docs-filer.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - brug synthesis angivet i stedet for urpmi-db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vælg alle træffere på kommandolinje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "undersøger parallelbehandling i fil [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - tillad søgning i 'provides' for at finde pakke.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting at fjerne"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - søg ikke i 'provides' for at finde pakke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - gennemfør upræcis søgning (samme som --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "læser hoveder fra medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - næste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - udvid forespørgsel til pakkeafhængigheder.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille udgave.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - udskriv en fejlrapport i et katalog angivet i næste\n"
-"                   argument.\n"
+"  navne eller rpm-filer givne på kommandolinjen vil blive installeret.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medie \"%s\" definerer ikke noget sted for rpm-filer"
+msgid "Choose location to save file"
+msgstr "Vælg sted at gemme filen"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm     - skriv mærke for kilde-rpm: kilde-rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Hvad der kan gøres med binære rpm-filer ved brug af --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunne ikke skrive listefil for \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Du har valgt en kildetekstpakke:\n"
+"\n"
+"%s\n"
+"\n"
+"Du ønsker formodenligt ikke at installere denne på din maskine (installering "
+"af den\n"
+"ville gøre det muligt for dig at ændre i kildeteksten og så oversætte den).\n"
+"\n"
+"Hvad ønsker du at gøre?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - skriv mærke-krav: alle krav.\n"
+msgid "Do nothing"
+msgstr "Gør ingenting"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
+msgid "Yes, really install it"
+msgstr "Ja, installér det virkelig"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - skriv mærke-beskrivelse: beskrivelse.\n"
+msgid "Save file"
+msgstr "Gem fil"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiering mislykkedes"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Du er ved at installere den følgende programmelpakke på din maskine:\n"
+"\n"
+"%s\n"
+"\n"
+"Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gennemfør generering af hdlist-filer.\n"
+msgid "Install it"
+msgstr "Installér den"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan kun bruges med --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Kataloget [%s] eksisterer allerede, brug venligst et andet katalog til "
+"fejlrapporten, eller slet det"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil fundet for medie \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - næste pakke er en kildepakke (samme som --src).\n"
+msgid "Copying failed"
+msgstr "Kopiering mislykkedes"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "installerer %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Kun superbrugeren har lov til at installere pakker"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "læser rpm-filer fra [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierer beskrivelsesfil for \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Hvad er dit valg? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
+msgid "Package installation..."
+msgstr "Pakkeinstallation..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Fjernelse mislykkedes"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual       - opret virtuelt medie som altid er opdatere,\n"
-"                     kun protokollen file:// er tilladt.\n"
+"Nogen forespurgte pakker kan ikke installeres:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "pakke %s er ikke fundet."
+msgid "do you agree ?"
+msgstr "Er du enig?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "fjerner medium \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Installationen kan ikke fortsætte fordi de følgende pakker\n"
+"skal fjernes for at andre kan opgraderes:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ingen grund til at angive <relativ sti for hdlist> med --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret "
+"(%d Mb)"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Annullér"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Du skal være root for at installere de følgende afhængigheder:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - næste pakke er en kildepakke (samme som -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vær venlig at indsætte mediet med navnet %s i enhed [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortér medier ifølge delstrenge, adskilt med komma.\n"
+msgid "Press Enter when ready..."
+msgstr "Tryk på retur, når den er klar..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke nå medie \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "Henter pakke %s..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kan ikke oprette medie \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% af %s færdige, resterer = %s, hastighed = %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - skriv mærke-pakker: pakker.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% færdig, hastighed = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - udskriv konfigurationen i form af urpmi.addmedia "
-"argumenter.\n"
+msgid "The following packages have bad signatures"
+msgstr "De følgende pakker har dårlige signaturer"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ønsker du at fortsætte installationen?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Du skal være root for at installere de følgende afhængigheder:\n"
+"Installationen mislykkedes, nogle filer mangler:\n"
 "%s\n"
+"Du ønsker måske at opdatere din urpmi-database"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - udskriv ændringslog.\n"
+msgid "Installation failed"
+msgstr "Installationen fejlede"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kan ikke få adgang til filen \"%s\", medie ignoreret"
+msgid "distributing %s"
+msgstr "distribuerer %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  (              - højreparantes for at lukke gruppeudtryk.\n"
+msgid "installing %s"
+msgstr "installerer %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "Ingen webhentning fundet, understøttede webhentninger er: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "undersøger hdlist-fil [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopierer hdlists-fil..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prøv installation med endnu større kraft (--force)? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skriver liste-fil for medie \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d installationstrasaktioner mislykkedes"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuelt medie \"%s\" bør have en klar url, medie ignoreret"
+msgid "Installation is possible"
+msgstr "Installation er mulig"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost     - skriv mærke-byggevært: byggevært.\n"
+msgid "Everything already installed"
+msgstr "alting er allerede installeret"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Gør ingenting"
+msgid "restarting urpmi"
+msgstr "genstarter urpmi"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "bruger tilknyttet medie for parallel tilstand: %s"
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"brug: urpmi.addmedia [--update] <navn> <url> [with <relativ sti>]\n"
+"hvor <url> er en af\n"
+"       file://<sti>\n"
+"       ftp://<login>:<adgangskode>@<vært>/<sti> with <relativt filnavn for "
+"hdlist>\n"
+"       ftp://<vært>/<sti> with <relativt filnavn for hdlist>\n"
+"       http://<vært>/<sti> with <relativt filnavn for hdlist>\n"
+"       removable://<sti>\n"
+"\n"
+"og [valgmuligheder] er følgende\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "monterer %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - opret et opdateringsmedium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"kan ikke behandle medie \"%s\" da listefil allerede bliver brugt af et andet "
-"medie"
+"  --probe-synthesis forsøg at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlists - forsøg at finde og bruge hdlist-fil.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - brug en anden root for rpm-installation.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% af %s færdige, resterer = %s, hastighed = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "beregner md5sum på hentet kilde-hdlist (eller -syntese)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - opret automatisk et medium for XXX-delen af en\n"
+"                   distribution, XXX kan være main, contrib, updates eller\n"
+"                   alt andet der er blevet konfigureret;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "kunne ikke importere pubkey-fil for \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - brug angivet adresse for liste over spejl, standard er\n"
+"                   %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  --no-uninstall - spørg aldirig om afinstallering af en pakke, afbryd "
-"installationen.\n"
+"  --version      - brug angivet distributionsversion, standard tages fra\n"
+"                   versionen af distributionen indikeret ved den\n"
+"                   installerede mandrake-release pakke.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq version %s\n"
-"Ophavsret © 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug:\n"
+"  --arch         - brug angivet arkitektur, standard er arkitekturen af\n"
+"                   mandrake-release pakken installeret.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual       - opret virtuelt medie som altid er opdatere,\n"
+"                     kun protokollen file:// er tilladt.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - udskriv også grupper med navn.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medie \"%s\" er ikke valgt"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rydder katalog med cache for headere.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Kun superbrugeren har lov til at installere pakker"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - gennemfør generering af hdlist-filer.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "bruger særligt miljø på %s\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan ikke tilføje opdateringer af en cooker-distribution\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finde hdlist-fil for \"%s\", medie ignoreret"
+msgid "retrieving mirrors at %s ..."
+msgstr "henter spejle på %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - lille tansaktionslængde, standard er %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ingen grund til at angive <relativ sti for hdlist> med --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - venstreparantes for at åbne gruppeudtryk.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kan ikke opdatere medie \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sti for hdlist> mangler\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binær OG-operator, sand hvis begge udtryk er sande.\n"
+msgid "`with' missing for network media\n"
+msgstr "'with' mangler for netværks-medie\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Kan ikke tilgå medie '%s',\n"
-"dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
+msgid "unable to create medium \"%s\"\n"
+msgstr "kan ikke oprette medie \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - skriv mærkegruppe: gruppe.\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"brug: urpmi.removemedia [-a] <navn> ...\n"
+"hvor <navn> er et medie-navn der skal fjernes.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - brug kun de opgivne medier, adskilt med komma.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - vælg alle medier.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "kan ikke oprette transaktion"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukendte valg '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "henter rpm-filer fra medie '%s'..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting at fjerne (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Du har valgt en kildetekstpakke:\n"
-"\n"
-"%s\n"
-"\n"
-"Du ønsker formodenligt ikke at installere denne på din maskine (installering "
-"af den\n"
-"ville gøre det muligt for dig at ændre i kildeteksten og så oversætte den).\n"
-"\n"
-"Hvad ønsker du at gøre?"
+"mangler det element der skal fjernes\n"
+"(én af %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuerer %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"brug: urpmi.update [valgmuligheder] <navn> ...\n"
+"hvor <navn> er et medie-navn der skal opdateres.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen fejlede"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - opdatér kun opdateringsmedie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "skriver config fil [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gennemtving opdatering af gpg-nøgle.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vælg alle ikke-udskiftelige medier.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - kontrollér rpm-signatur før installation.\n"
-"                   (--no-verify-rpm deaktiverer det, standard er "
-"aktiveret).\n"
+"mangler det element der skal opdateres\n"
+"(én af %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Ophavsret © 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, 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]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - skriv tilgængelige pakker.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - opret et opdateringsmedium.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - list tilgængelige medier.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - list tilgængelige medier og deres url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - gennemfør upræcis søgning (samme som --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "O.k."
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - udskriv konfigurationen i form af urpmi.addmedia "
+"argumenter.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "ugyldig hdlist beskrivelse '%s' i hdlists-fil"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - list tilgængelige knuder ved brug af --parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "fjerner %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list tilgængelige parallelle aliaser.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - opret automatisk et medium for XXX-delen af en\n"
-"                   distribution, XXX kan være main, contrib, updates eller\n"
-"                   alt andet der er blevet konfigureret;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - skriv mærke-størrelse: størrelse.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "for at kunne beholde %s"
+"  --headers      - udtræk headere for pakke listet fra urpmi-db til\n"
+"                   stdud (kun root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "grundet uopfyldt %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - giv alle kildepakker før hentning (kun root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Automatisk installation af pakker...\n"
-"Du bestilte installation af pakke %s\n"
+"  --use-distrib  - konfigurér urpmi løbende fra et distrib-træ.\n"
+"              Dette muliggør at spørge efter en distro.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-database låst"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - udskriv ændringslog.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - udvid forespørgsel til pakkeafhængigheder.\n"
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-" --resume       - genoptag overførsel af delvist hentede filer\n"
-"                   (--no-resume deaktiverer det, standard er deaktiveret).\n"
+"  -u             - fjern pakke hvis en nyere version allerede er "
+"installeret.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "undersøger pubkey-fil for '%s'"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - færdiggør uddata med pakke der skal fjernes.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omvendt søgning til hvad der kræver pakke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tager udskifteligt medium som \"%s\""
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - udskriv nyttig information på læsevenlig form.\n"
 
-#: ../urpmi:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Du er ved at installere den følgende programmelpakke på din maskine:\n"
-"\n"
-"%s\n"
-"\n"
-"Du vil måske foretrække blot at gemme den. Hvad er dit valg?"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - udskriv også grupper med navn.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - gennemfør søgning efter fuzzy (samme som -y).\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - udskriv også version og udgave med navn.\n"
 
-#: ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - fjern pakke hvis en nyere version allerede er "
-"installeret.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l..          - udskriv filer i pakken.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:90
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlists - forsøg at finde og bruge hdlist-fil.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "due to missing %s"
-msgstr "grundet manglende %s"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan kun bruges med --parallel"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:327
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - brug kun opdateringsmedie.\n"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "ingen fuld medie-liste blev fundet"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"brug: urpmi.update [valgmuligheder] <navn> ...\n"
-"hvor <navn> er et medie-navn der skal opdateres.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "prøver at forbigå eksisterende medie \"%s\", undgår"
+#~ 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:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - afprøv om installationen kan udføres korrekt.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Ophavsret © 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Dette er frit programmel og kan redistribueres under vilkårene for GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "brug:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Ukendt webfetch `%s' !!!\n"
@@ -2157,9 +2203,6 @@ msgstr "  --test         - afprøv om installationen kan udføres korrekt.\n"
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "prøv urpmf --help for flere valgmuligheder"
 
-#~ msgid "no full media list was found"
-#~ msgstr "ingen fuld medie-liste blev fundet"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "kopierer kildeliste for \"%s\"..."
 
diff --git a/po/de.po b/po/de.po
index c5473658..7d7e5a04 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-05 00:28+0100\n"
 "Last-Translator: Frank Köster <frank@dueppel13.de>\n"
 "Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -39,890 +39,789 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - automatisch alle Medien von einem Installations-Medium\n"
-"                   erzeugen.\n"
+msgid "installing %s\n"
+msgstr "Installiere %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "Ich kann deie RPM-Datei kann nicht öffnen."
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Automatische Installation von Paketen ...\n"
+"Sie wünschen die Installation von Paket „%s“\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
+msgid "Is this OK?"
+msgstr "Ist das in Ordnung?"
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, 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:"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
-msgstr "Entfernen des Pakets „%s“"
+msgid "Cancel"
+msgstr "Abbruch"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
-msgstr "„%s“"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kann parallel Modus nicht mit use-distrib Modus nutzen"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpmi:1
+#: ../_irpm:63
 #, c-format
-msgid "Everything already installed"
-msgstr "Alles bereits installiert"
+msgid "%s: command not found\n"
+msgstr "%s: Befehl nicht gefunden\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"Verwendung: %s [Optionen]\n"
+"wobei [Optionen] sind von\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "Benutze Prozess %d zur Ausführung des Vorgangs"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - beschränke Ausgabe auf angegebene Gruppe.\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ihre Wahl? (1-%d) "
+msgid "                    defaults is %s.\n"
+msgstr "                    Voreinstellung ist %s.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d Informationen im Cache gefunden."
+msgid "unknown protocol defined for %s"
+msgstr "Unbekanntes Protokoll für %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "kein webfetch gefunden, unterstützte webfetch sind: %s\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:95
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - Angabe von Benutzerkennzeichen und Passwort zur\n"
-"                   Authentifizierung gegenüber dem Proxy\n"
-"                   (Format: <Benutzerkennzeichen:Passwort>).\n"
+msgid "unable to handle protocol: %s"
+msgstr "Ich kann mit dem Prtokoll „%s“ nicht umgehen."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
+msgid "syntax error in config file at line %s"
+msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Holen des RPMs [%s]..."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
 
-#: ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases  - Alle verfügbaren Aliase auflisten.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
+"verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:196
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...Holen fehlgeschlagen: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
+"einem anderen Medium verwendet wird."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
-"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
+"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
+"verwendet wird."
 
-#: ../urpmf:1
+#: ../urpm.pm:209
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"  -o              - binärer ODER Operator, Wahr wenn ein Ausdruck wahr ist.\n"
+"Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
+"existiert."
 
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation ..."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "Konnte Medium dieser HD-Liste nicht bestimmen [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Ungültiger RPM Name [%s]."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
+"das Medium wird daher ignoriert."
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "Konnte nicht auf Listendatei von „%s“ zugreifen, Medium ignoriert"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d Installation schlugen Fehl"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "Versuche existierendes Medium „%s“ zu umgehen, vermeidend"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
-"hdlists“ wurde nicht gefunden)"
+"Das virtuelle Medium „%s“ sollte weder eine HD-Liste noch eine Dateiliste "
+"angeben, es wird daher ignoriert."
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"Das virtuelle Medium „%s“ sollte eine eindeutige URL haben, es wird ignoriert"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Choose location to save file"
-msgstr "Wähle Speicherort aus"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpmf:1
+#: ../urpm.pm:278
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:301
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die folgenden Pakete enthalten „%s“: %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Install it"
-msgstr "Installieren"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"Die Dateiliste für „%s“ kann nicht kontrolliert werden, es wird ignoriert."
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - benutze X-Oberfläche.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Eines der folgenden Pakete wird benötigt:"
+msgid "taking removable device as \"%s\""
+msgstr "Verwende Wechselmedium als „%s“"
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete entfernt (%d "
-"MB)"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - Benutze beste Oberfläche abhängig von der Umgebung:\n"
-"                   X or Text-Modus.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Holen des Pakets „%s“ ..."
+msgid "unable to write config file [%s]"
+msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Was kann mit Binärpaketen getan werden, wenn --install-src genutzt wird"
+msgid "write config file [%s]"
+msgstr "Schreiben der Konfigurationsdatei [%s]."
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
-"Systems.\n"
+#: ../urpm.pm:402
+#, fuzzy, c-format
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kann parallel Modus nicht mit use-distrib Modus nutzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
 #, c-format
-msgid "no package named %s"
-msgstr "Kein Paket namens %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Ich kann „%s“ in Datei [%s] nicht parsen."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
-"\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "Prüfen der Parallel-Handler in Datei [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installation fehlgeschlagen, einige Dateien fehlen:\n"
-"%s\n"
-"Sie sollten Ihre urpmi-Datenbank aktualisieren"
+msgid "found parallel handler for nodes: %s"
+msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "Verwende assoziiertes Medium für den parallel Modus: %s"
+
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Verwendung: urpmi.removemedia [-a] <Name> ...\n"
-"Wobei <Name> das zu entfernende Medium ist.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "Ich kann die parallel Option „%s“ nicht nutzen."
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpm.pm:452
+#, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Die Installation kann nicht fortgesetzt werden, da folgende\n"
-"Pakete entfernt werden müssen, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s\n"
+"--synthesis kann nicht mit --media, , --excludemedia, --sortmedia, --update "
+"oder --parallel verwendet werden."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' fehlt für Netzwerk Medien.\n"
+msgid "examining synthesis file [%s]"
+msgstr "Lesen der Synthese-Datei [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - Dateien des Paketes auflisten.\n"
+msgid "examining hdlist file [%s]"
+msgstr "Prüfen der HD-Liste [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "unbekanntes Paket"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "Das virtuelle Medium „%s“ ist nicht lokal, Medium wird ignoriert"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "Die Installation ist möglich"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Probleme beim Lesen der HD-Liste oder Synthese-Datei des Mediums „%s“"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
-"durchführen zu können:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "Zweiter Durchlauf zum Berechnen der Paketabhängigkeiten\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete "
-"installiert (%d MB)"
+msgid "skipping package %s"
+msgstr "Paket %s augelassen"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"Es ist nicht möglich, das Medium „%s“ zu verwenden, da keine Dateilise [%s] "
-"existiert."
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "Anstatt des Upgrade Paketes lieber folgendes %s installieren"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "unable to open rpmdb"
+msgstr "Ich kann deie RPM-Datei kann nicht öffnen."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "Ich kann keine Aktualisierungen von Cooker einspielen.\n"
+msgid "medium \"%s\" already exists"
+msgstr "Das Medium „%s“ existiert bereits."
+
+#: ../urpm.pm:629
+#, fuzzy, c-format
+msgid "virtual medium need to be local"
+msgstr "Virtuelles Medium muss lokal sein"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ausführlicher Modus.\n"
+msgid "added medium %s"
+msgstr "Medium %s hinzugefügt"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initialisierung ..."
+msgid "unable to access first installation medium"
+msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
+msgid "copying hdlists file..."
+msgstr "Lesen der HD-Liste ..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - Alle Parameter ausgeben.\n"
+msgid "...copying failed"
+msgstr "...das Kopieren scheiterte"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
+msgid "...copying done"
+msgstr "... das Kopieren ist beendet!"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"Das virtuelle Medium „%s“ sollte weder eine HD-Liste noch eine Dateiliste "
-"angeben, es wird daher ignoriert."
+"Kein Zugriff auf das erste Installationsmedium (die Datei „Mandrake/base/"
+"hdlists“ wurde nicht gefunden)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "Berechnen der md5-Summe der kopieren HD-Liste (oder synthesis-Datei)"
+msgid "retrieving hdlists file..."
+msgstr "Holen der HD-Liste ..."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - Exclude Pfad durch Kommata getrennt.\n"
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
+#, c-format
+msgid "...retrieving done"
+msgstr "...Holen fertig"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
+msgid "...retrieving failed: %s"
+msgstr "...Holen fehlgeschlagen: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Unbekannte Optionen „%s“\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "Fehlerhafte HD-Liste in Datei „%s“"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - aufteilen in kleine Vorgänge wenn mehr als die gegebenen\n"
-"                   Pakete installiert oder upgegraded werden,\n"
-"                   Voreinstellung ist %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "Probleme beim Lesen der HD-Liste oder Synthese-Datei des Mediums „%s“"
+msgid "selecting multiple media: %s"
+msgstr "Auswahl des Mehrfachmediums: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
+msgid "\"%s\""
+msgstr "„%s“"
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "Entfernen des Mediums „%s“."
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
-"Paket.\n"
+"Zugang zum Medium „%s“nicht möglich,\n"
+"das kann beim manuellen Mounten des Verzeichnisses des erstellten Mediums "
+"passieren."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
-"                    auflisten.\n"
+"Das virtuelle Medium „%s“ sollte eine gültige Quell HD- oder Synthesis-Liste "
+"verwenden, es wird daher ignoriert."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "Erstellen der HD-Liste [%s]."
+msgid "copying description file of \"%s\"..."
+msgstr "Kopiere Beschreibungs-Datei von „%s“..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - behalte existierende Pakete wenn möglich, lehne "
-"angefragte\n"
-"                   Pakete ab, die zu einer Deinstallation führen.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "berechne md5sum von existierender Quell hdlist (oder synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "Prüfen der MD5-Summe"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: Befehl nicht gefunden\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "Ich kann die RPM-Datei nicht registrieren."
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
-"                   ohne Abhängigkeitskontrolle.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "Berechnen der md5-Summe der kopieren HD-Liste (oder synthesis-Datei)"
+
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "Kopieren von [%s] fehlgeschlagen (md5sum fehlerhaft)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Ich kann mit dem Prtokoll „%s“ nicht umgehen."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Probleme beim Lesen der Synthese-Datei des Mediums „%s“"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "Holen der HD-Liste ..."
+msgid "reading rpm files from [%s]"
+msgstr "Lesen der RPM-Dateien von [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ja, wirklich installieren"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "added medium %s"
-msgstr "Medium %s hinzugefügt"
+msgid "no rpm files found from [%s]"
+msgstr "Keine rpm-Dateien in [%s] gefunden"
 
-#: ../urpmi:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Hole HD-Liste (oder synthesis-Datei) von „%s“..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "HD-Liste (oder synthesis-Datei) als „%s“ gefunden"
+
+#: ../urpm.pm:1396
 #, fuzzy, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"Erstellte Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, "
-"upgraden=%d)"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "errechne md5sum der erhaltenen Quell HD Liste (oder Synthesis Liste)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum stimmt nicht"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Syntax-Fehler in Konfigurationsdatei auf Linie %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
-"                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "Datei [%s] wird bereits im selben Medium „%s“ verwendet."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "um %s zu installeren."
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "Verschiebe %s Einträge in Depslist-Datei"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster.\n"
+msgid "unable to write list file of \"%s\""
+msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
 
-#: ../urpmi:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "Anstatt des Upgrade Paketes lieber folgendes %s installieren"
+msgid "writing list file for medium \"%s\""
+msgstr "schreibe Dateiliste für das Medium „%s“"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "Holen der Spiegelserver-Liste von %s ..."
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          -  Ausgabe des Attributs: URL.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Unbekanntes Protokoll für %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "Holen der Beschreibungsdatei für „%s“ ..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - Ausgabe des Attributs: Veraltet.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importierter Schlüssel %s von Pubkey Datei von „%s“"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "Das Medium „%s“ existiert bereits."
+msgid "unable to import pubkey file of \"%s\""
+msgstr "kann die Beschreibungsdatei für „%s“ nicht importieren."
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "Installiere %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "Lesen der Paketinformationen des Mediums „%s“."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Was soll aktualisiert werden?\n"
-"(eins aus %s)\n"
+msgid "building hdlist [%s]"
+msgstr "Erstellen der HD-Liste [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "versuche %s voranzubringen"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Erstellen der HD-Liste für das Medium „%s“"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "Ich kann das Paket „%s“ nicht entfernen."
+msgid "found %d headers in cache"
+msgstr "%d Informationen im Cache gefunden."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Probleme beim Lesen der Synthese-Datei des Mediums „%s“"
+msgid "removing %d obsolete headers in cache"
+msgstr "Entferne %d veraltete Informationen aus dem Cache."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Was soll entfernt werden?\n"
-"(eins aus %s)\n"
+msgid "mounting %s"
+msgstr "Einhängen von „%s“"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - Alle Medien auswählen.\n"
+msgid "unmounting %s"
+msgstr "Aushängen von „%s“"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Fehlende Signatur (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "Verschiebe %s Einträge in Depslist-Datei"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "Ich kann die RPM-Dateien von [%s] nicht lesen: %s"
+msgid "no entries relocated in depslist"
+msgstr "keine Einträge in depslist-Datei verschoben"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-" --parallel     - verteilter urpmi Aufru auf allen teilnehmenden\n"
-"                  Maschinen.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "Ungültiger RPM Name [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "Holen des RPMs [%s]..."
 
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+#: ../urpm.pm:1955 ../urpm.pm:2821
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "unable to register rpm file"
+msgstr "Ich kann die RPM-Datei nicht registrieren."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - beschränke Ausgabe auf angegebene Gruppe.\n"
+msgid "error registering local packages"
+msgstr "Fehler bei der Registrierung lokaler Pakete"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
-"verwenden, es wird daher ignoriert."
+msgid "no package named %s"
+msgstr "Kein Paket namens %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "Inkorrekte Eingabe: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Die folgenden Pakete enthalten „%s“: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Es existieren mehrere Pakete mit dem selben RPM-Dateinamen „%s“"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Konnte [%s] beim Wert „%s“ nicht korrekt analysieren."
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Einige der gewünschten Pakete können nicht installiert werden:\n"
-"%s"
+"Medium „%s“ nutzt eine ungültige Dateiliste:\n"
+"  Spiegelserver ist möglicherweise nicht aktuell, versuche eine andere "
+"Methode"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installieren des Pakets „%s“ (%s/%s) ..."
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "Medium „%s“ definiert keinen Ort für rpm Dateien"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "keine Einträge in depslist-Datei verschoben"
+msgid "package %s is not found."
+msgstr "Paket %s wurde nicht gefunden."
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installiere nur Quellpakete (keine Binärpakete).\n"
+msgid "urpmi database locked"
+msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - beziehe Perl Code direkt als perl -e ein.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "Das Medium „%s“ wurde nicht ausgewählt."
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Sind Sie einverstanden?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Die Dateiliste für „%s“ ist inkonsistent, das Medium wird ignoriert."
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "„%s“ wurde als Wechselmedium angegeben, ist es aber nicht."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...Holen fertig"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "Füge Paket hinzu %s (ID=%d, EID=%d, Update=%d, Datei=%s)"
+msgid "unable to access medium \"%s\""
+msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "skipping package %s"
-msgstr "Paket %s augelassen"
+msgid "malformed input: [%s]"
+msgstr "Inkorrekte Eingabe: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Falsche Signatur (%s)"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Holen der RPMs von Medium  „%s“..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
-"abgefragt.\n"
+msgid "Preparing..."
+msgstr "Vorbereiten ..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2752
 #, c-format
+msgid "using process %d for executing transaction"
+msgstr "Benutze Prozess %d zur Ausführung des Vorgangs"
+
+#: ../urpm.pm:2783
+#, fuzzy, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi Version %s\n"
-"Copyright © 1999, 2000, 2001, 2002, 2003 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
-"\n"
-"Verwendung:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Konnte [%s] beim Wert „%s“ nicht korrekt analysieren."
+"Erstellte Vorgang zum Installieren auf %s (entfernen=%d, installieren=%d, "
+"upgraden=%d)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
+msgid "unable to create transaction"
+msgstr "unmöglich den Vorgang einzuleiten"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "Konnte Medium dieser HD-Liste nicht bestimmen [%s]"
+msgid "removing package %s"
+msgstr "Entfernen des Pakets „%s“"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Die Struktur der HD-Liste von „%s“ ist nicht korrekt."
+msgid "unable to remove package %s"
+msgstr "Ich kann das Paket „%s“ nicht entfernen."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"Das Medium „%s“ versucht eine bereits verwendete HD-Liste ebenfalls zu "
-"verwenden, es wird daher ignoriert."
+#: ../urpm.pm:2806
+#, fuzzy, c-format
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "Füge Paket hinzu %s (ID=%d, EID=%d, Update=%d, Datei=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "wegen Konflikten mit %s"
+msgid "unable to install package %s"
+msgstr "Ich kann das Paket „%s“ nicht installeren."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Entferne %d veraltete Informationen aus dem Cache."
+msgid "due to missing %s"
+msgstr "wegen fehlendem %s"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
+#: ../urpm.pm:3010 ../urpm.pm:3040
+#, fuzzy, c-format
+msgid "due to unsatisfied %s"
+msgstr "wegen unbefriedigter %s "
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
+msgid "trying to promote %s"
+msgstr "versuche %s voranzubringen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "Das virtuelle Medium „%s“ ist nicht lokal, Medium wird ignoriert"
+msgid "in order to keep %s"
+msgstr "um %s zu behalten"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "Preparing..."
-msgstr "Vorbereiten ..."
+msgid "in order to install %s"
+msgstr "um %s zu installeren."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    Voreinstellung ist %s.\n"
+msgid "due to conflicts with %s"
+msgstr "wegen Konflikten mit %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Verwendung verschiedener Wechselmedien [%s] für „%s“"
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - versuche keine Synthesis oder\n"
-"                   HD-Liste zu finden.\n"
+msgid "unrequested"
+msgstr "Unangefordert"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "Kopieren von [%s] fehlgeschlagen (md5sum fehlerhaft)"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - konfiguriere urpmi von einem distrib Baum.\n"
-"                   Das erlaubt eine Distribution zu befragen.\n"
+msgid "Invalid signature (%s)"
+msgstr "Falsche Signatur (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"Verwendung: %s [Optionen]\n"
-"wobei [Optionen] sind von\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Ungültige Schlüssel ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
+msgid "Missing signature (%s)"
+msgstr "Fehlende Signatur (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"Sie können „%s“ nicht als Name für dieses Medium verwenden, da er bereits "
-"verwendet wird."
+msgid "bad proxy declaration on command line\n"
+msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - Ausgabe des Attributs: Steht in Konflikt mit.\n"
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"Das virtuelle Medium „%s“ sollte eine gültige Quell HD- oder Synthesis-Liste "
-"verwenden, es wird daher ignoriert."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -939,676 +838,736 @@ msgstr ""
 "\n"
 "Verwendung:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"Verwendung: urpmi.addmedia [Optionen] <Name> <URL> [with <relativer Pfad>]>\n"
-"Mit <URL> aus folgender Menge:\n"
-"       file://<Pfad>\n"
-"       ftp://<Login>:<Passwort>@<Rechner>/<Pfad> with <relativer Pfad zur HD-"
-"Liste>\n"
-"       ftp://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
-"       http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
-"       removable://<Pfad>\n"
-"\n"
-"und [Optionen] aus\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "Kopiere HD-Liste (oder synthesis-Datei) von „%s“ ..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "... das Kopieren ist beendet!"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Ich kann die parallel Option „%s“ nicht nutzen."
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"Medium „%s“ nutzt eine ungültige Dateiliste:\n"
-"  Spiegelserver ist möglicherweise nicht aktuell, versuche eine andere "
-"Methode"
+"  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
+"existieren.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "Es kann nicht auf das erste Installationsmedium zugegriffen werden."
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+" --parallel     - verteilter urpmi Aufru auf allen teilnehmenden\n"
+"                  Maschinen.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid "virtual medium need to be local"
-msgstr "Virtuelles Medium muss lokal sein"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "error registering local packages"
-msgstr "Fehler bei der Registrierung lokaler Pakete"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - schränke die Dowloadgeschwindigkeit ein.\n"
+#: ../urpme:47
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - Konfiguriere urpmi von einem distrib Baum, nützlich\n"
+"                  um einen chroot mit --root Option zu (de)installieren.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "HD-Liste (oder synthesis-Datei) als „%s“ gefunden"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "Holen der HD-Liste (oder synthesis-Datei) fehlgeschlagen"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "Keine rpm-Dateien in [%s] gefunden"
+msgid "unknown packages"
+msgstr "unbekannte Pakete "
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Es wurde nichts in die Dateiliste von „%s“ geschrieben."
+msgid "unknown package"
+msgstr "unbekanntes Paket"
 
-#: ../urpmi:1
+#: ../urpme:93
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
+msgid "removing package %s will break your system"
+msgstr "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "berechne md5sum von existierender Quell hdlist (oder synthesis)"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - komplette Ausgabe von zu entfernenden Paketen.\n"
+msgid "Nothing to remove"
+msgstr "Nichts zu entfernen"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to install package %s"
-msgstr "Ich kann das Paket „%s“ nicht installeren."
+msgid "Checking to remove the following packages"
+msgstr "Überprüfe das Entfernen folgender Pakete"
 
-#: ../urpmi:1
+#: ../urpme:106
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
-"  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
-"                   ohne Abhängigkeits- und Integritätskontrolle.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "Datei speichern"
-
-#: ../urpm/args.pm:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Ich kann das RPM „%s“ nicht lesen.\n"
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete entfernt (%d "
+"MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "Die Konfigurationsdatei [%s] kann nicht geschrieben werden."
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpme:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
+msgid "removing %s"
+msgstr "Entferne %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ungültige Schlüssel ID (%s)"
+msgid "Removing failed"
+msgstr "Entfernen schlug fehl"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --force        - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
-"existieren.\n"
+"urpmf Version %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
+"Verwendung:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Ich kann den Pfadnamen für das Wechselmedium „%s“ nicht finden."
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
-"  --probe-synthesis - Versuche Synthesis Datei zu finden und zu nutzen.\n"
+"  --excludemedia - Benutze keine durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, fuzzy, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch "
+"Kommata.\n"
+
+#: ../urpmf:37 ../urpmq:48
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:38
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ausführlicher Modus.\n"
+
+#: ../urpmf:39
+#, fuzzy, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - Tag Namen nicht drucken (Vorgabe falls kein Tag in der\n"
+"                    Kommandozeile angegeben wurde, imkompatibel mit\n"
+"                    interaktivem Modus).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:41
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - keine identischen Zeilen ausgeben.\n"
 
-#: ../urpme:1
+#: ../urpmf:42
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Überprüfe das Entfernen folgender Pakete"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - Alle Parameter ausgeben.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - Ausgabe des Attributs: Gruppe.\n"
+
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - Ausgabe des Attributs: Größe.\n"
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - Ausgabe des Attributs: Epoche.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unrequested"
-msgstr "Unangefordert"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - Ausgabe des Attributs „Zusammenfassung“.\n"
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - Ausgabe des Attributs: Beschreibung.\n"
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - Ausgabe des Attributs: Quell RPM.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     -  Ausgabe des Attributs: Packer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    -  Ausgabe des Attributs: Build host.\n"
+
+#: ../urpmf:51
+#, fuzzy, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          -  Ausgabe des Attributs: URL.\n"
+
+#: ../urpmf:52
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Ich habe keinen Zugriff auf die RPM-Datei [%s]."
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - Ausgabe des Attributs „Stellt zur Verfügung“.\n"
+
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - Ausgabe des Attributs: Benötigt.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - Ausgabe des Attribus: Dateien.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Ich kann „%s“ in Datei [%s] nicht parsen."
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - Ausgabe des Attributs: Steht in Konflikt mit.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Wollen Sie die Installation fortsetzen?"
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - Ausgabe des Attributs: Veraltet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Ich kann das RPM-Paket „%s“ von Medium „%s“ nicht lesen."
-
-#: ../urpmi:1
-#, fuzzy, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - konfiguriere urpmi von einem distrib Baum, nützlich\n"
-"                   zum Installieren eines chroot mit --root Option.\n"
+"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
+"                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Erstellen der HD-Liste für das Medium „%s“"
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
+"  -f             - Ausgabe von Version, Release und Architektur mit dem "
+"Namen.\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - nutze spezifizierte Distributionsversion, die "
-"Voreinstellung\n"
-"                           stammt aus der Version der Distribution, die in "
-"dem\n"
-"                   installierten mandrake-release Paket steht.\n"
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - beziehe Perl Code direkt als perl -e ein.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - nutze spezifizierte URL als Spiegelserverliste, die "
-"Vorgabe ist\n"
-"                   %s\n"
+"  -a             - binärer UND operator, wahr falls beide Ausdrücke wahr "
+"sind.\n"
 
-#: ../urpme:1
-#, fuzzy, c-format
+#: ../urpmf:63
+#, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - Konfiguriere urpmi von einem distrib Baum, nützlich\n"
-"                  um einen chroot mit --root Option zu (de)installieren.\n"
+"  -o              - binärer ODER Operator, Wahr wenn ein Ausdruck wahr ist.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unäres NICHT, wahr falls Ausdruck falsch.\n"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - linke Klammer zum Öffnen eines Gruppen Ausdrucks.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - rechte Klammer zum Schließen eines Gruppen Ausdrucks.\n"
+
+#: ../urpmf:114
+#, fuzzy, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
-"für Fehlerberichte oder löschen Sie dieses"
+"Antwort ist :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "Aushängen von „%s“"
+msgid "using specific environment on %s\n"
+msgstr "nutze spezielle Umgebung für %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
-"um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% fertiggestellt, Geschwindigkeit = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi Version %s\n"
+"Copyright © 1999, 2000, 2001, 2002, 2003 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
+"\n"
+"Verwendung:\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "restarting urpmi"
-msgstr "starte urpmi neu"
+#: ../urpmi:82
+#, fuzzy, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
+"                   der urpmi-DB.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "Lesen der Synthese-Datei [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - niemals fragen bei Paketdeinstallation, Installation "
+"abbrechen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...das Kopieren scheiterte"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - behalte existierende Pakete wenn möglich, lehne "
+"angefragte\n"
+"                   Pakete ab, die zu einer Deinstallation führen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"Es ist nicht möglich, auf die HD-Liste „%s“ zuzugreifen,\n"
-"das Medium wird daher ignoriert."
+"  --split-level  - aufteilen in kleine Vorgänge wenn mehr als die gegebenen\n"
+"                   Pakete installiert oder upgegraded werden,\n"
+"                   Voreinstellung ist %d.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stiller Modus.\n"
+#: ../urpmi:91
+#, fuzzy, c-format
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - kleine Länge der Vorgänge, Voreinstellung ist %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ausführlicher Modus.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
-".\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - Ausgabe von Header-Informationen über Pakete aus der "
-"urpmi-DB \n"
-"                   in die Standard-Ausgabe (nur root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installiere nur Quellpakete (keine Binärpakete).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "unbekannte Pakete "
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Auswahl des Mehrfachmediums: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - Ausgabe von Version, Release und Architektur mit dem "
-"Namen.\n"
+"  --allow-nodeps - Erlaube Anwenderbefragung zur Paketinstallation\n"
+"                   ohne Abhängigkeitskontrolle.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "Datei [%s] wird bereits im selben Medium „%s“ verwendet."
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - Erlaube Anwenderbefragung zur Paketinstallation\n"
+"                   ohne Abhängigkeits- und Integritätskontrolle.\n"
 
-#: ../urpmi.removemedia:1
-#, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+#: ../urpmi:104
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
-"um neue Medien hinzuzufügen)\n"
+"  --use-distrib  - konfiguriere urpmi von einem distrib Baum, nützlich\n"
+"                   zum Installieren eines chroot mit --root Option.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr ""
-"Die Dateiliste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - Benutze wget um entfernte Dateien zu laden.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - Diese Hilfe-Botschaft anzeigen.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "Parallel-Handler für folgende Knoten gefunden: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - schränke die Dowloadgeschwindigkeit ein.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"Antwort ist :\n"
-"%s\n"
+"  --resume       - setze Transfer einer partiell-heruntergeladenen Datei "
+"fort\n"
+"                   (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - Verwende einen HTTP Proxy, als Standard-Portnummer\n"
+"                   wird 1080 angenommen (Format: <ProxyRechner[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf Version %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
-"Verwendung:\n"
+"  --proxy-user   - Angabe von Benutzerkennzeichen und Passwort zur\n"
+"                   Authentifizierung gegenüber dem Proxy\n"
+"                   (Format: <Benutzerkennzeichen:Passwort>).\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
+#: ../urpmi:115
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - Tag Namen nicht drucken (Vorgabe falls kein Tag in der\n"
-"                    Kommandozeile angegeben wurde, imkompatibel mit\n"
-"                    interaktivem Modus).\n"
+"  --bug          - Erstellen eines Fehlerberichts im durch das nächste\n"
+"                   Argument angegebenen Ordner.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - keine identischen Zeilen ausgeben.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - benutze X-Oberfläche.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis kann nicht mit --media, , --excludemedia, --sortmedia, --update "
-"oder --parallel verwendet werden."
+"  --best-output  - Benutze beste Oberfläche abhängig von der Umgebung:\n"
+"                   X or Text-Modus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - benutze spezifizierte Architektur, die Voreinstellung ist "
-"die im\n"
-"                   mandrake-release Paket angegebene.\n"
+"  --verify-rpm   - Überprüfung der RPM-Signatur vor der Installation.\n"
+"                   (--no-verify-rpm deaktiviert das Verhalten,\n"
+"                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Ist das in Ordnung?"
+#: ../urpmi:125
+#, fuzzy, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - Exclude Pfad durch Kommata getrennt.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - Schließe Dokumentationsdateien aus.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
-"                   der urpmi-DB.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "Prüfen der Parallel-Handler in Datei [%s]"
-
-#: ../urpme:1
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nichts zu entfernen"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importierter Schlüssel %s von Pubkey Datei von „%s“"
+"  -a             - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Lesen der Paketinformationen des Mediums „%s“."
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - Erlaube Suche in „Stellt zur Verfügung“ nach einem "
+"Paket.\n"
 
-#: ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - nicht in „Stellt zur Verfügung“ nach dem Paket suchen.\n"
 
-#: ../urpmi:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --bug          - Erstellen eines Fehlerberichts im durch das nächste\n"
-"                   Argument angegebenen Ordner.\n"
+"  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "Medium „%s“ definiert keinen Ort für rpm Dateien"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - Ausgabe des Attributs: Quell RPM.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Ich kann die Dateiliste für „%s“ nicht schreiben."
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - Ausgabe des Attributs: Benötigt.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "Versuch, das nicht existierende Medium „%s“ auszuwählen."
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - Ausgabe des Attributs: Beschreibung.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  Namen oder RPM-Dateien von der Kommandozeile werden installiert.\n"
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid "Copying failed"
-msgstr "Kopieren fehlgeschlagen"
+msgid "Choose location to save file"
+msgstr "Wähle Speicherort aus"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:197
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Was kann mit Binärpaketen getan werden, wenn --install-src genutzt wird"
 
-#: ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kann nur mit --parallel benutzt werden"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Sie haben ein Quellpaket gewählt:\n"
+"\n"
+"%s\n"
+"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren "
+"(installieren\n"
+" bietet die Möglichkeit den Quellcode zu ändern und zu kompilieren)\n"
+"\n"
+"Was wollen Sie machen?"
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Keine HD-Liste für das Medium „%s“ gefunden."
+msgid "Do nothing"
+msgstr "Nichts machen"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:213
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - es folgt ein Quellpaket (identisch zu „--src“).\n"
+msgid "Yes, really install it"
+msgstr "Ja, wirklich installieren"
 
-#: ../urpmi:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "installing %s"
-msgstr "Installiere %s"
+msgid "Save file"
+msgstr "Datei speichern"
 
-#: ../urpm.pm:1
+#: ../urpmi:225
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Lesen der RPM-Dateien von [%s]"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Sie sind dabei folgendes Software Paket auf Ihrem Rechner zu installieren:\n"
+"\n"
+"%s\n"
+"\n"
+"Vielleicht bevorzugen Sie es nur zu speichern. Was ist Ihre Wahl?"
 
-#: ../urpm.pm:1
+#: ../urpmi:230
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Kopiere Beschreibungs-Datei von „%s“..."
+msgid "Install it"
+msgstr "Installieren"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Verzeichnis [%s] existiert bereits, bitte nutzen Sie ein anderes Verzeichnis "
+"für Fehlerberichte oder löschen Sie dieses"
 
-#: ../urpme:1
+#: ../urpmi:240
 #, c-format
-msgid "Removing failed"
-msgstr "Entfernen schlug fehl"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
-"  --virtual      - erstelle virtuelle Medien, welche immer aktuell sind,\n"
-"                   nur das file:// Protokoll ist erlaubt.\n"
+msgid "Copying failed"
+msgstr "Kopieren fehlgeschlagen"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "package %s is not found."
-msgstr "Paket %s wurde nicht gefunden."
+msgid "Only superuser is allowed to install packages"
+msgstr "Nur der Systemadministrator darf Pakete installieren."
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "Entfernen des Mediums „%s“."
+msgid "One of the following packages is needed:"
+msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:403
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
+msgid "What is your choice? (1-%d) "
+msgstr "Ihre Wahl? (1-%d) "
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Cancel"
-msgstr "Abbruch"
+msgid "Package installation..."
+msgstr "Paketinstallation ..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - es folgt ein Quellpaket (identisch zu „-s“).\n"
+msgid "Initializing..."
+msgstr "Initialisierung ..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
-"                   Erstellung von Fehlerberichten).\n"
+"Einige der gewünschten Pakete können nicht installiert werden:\n"
+"%s"
+
+#: ../urpmi:440 ../urpmi:466
+#, c-format
+msgid "do you agree ?"
+msgstr "Sind Sie einverstanden?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, fuzzy, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch "
-"Kommata.\n"
+"Die Installation kann nicht fortgesetzt werden, da folgende\n"
+"Pakete entfernt werden müssen, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Ich kann auf das Medium „%s“ nicht zugreifen."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Die folgenden Pakete müssen entfernt werden, um die Aktualisierungen \n"
+"durchführen zu können:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     -  Ausgabe des Attributs: Packer.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - verwerfe die Konfiguration in der Form eines urpmi."
-"addmedia Argumentes.\n"
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete "
+"installiert (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1618,431 +1577,518 @@ msgstr ""
 "können:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - Gebe Changelog aus.\n"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Konnte nicht auf Listendatei von „%s“ zugreifen, Medium ignoriert"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%s“."
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - rechte Klammer zum Schließen eines Gruppen Ausdrucks.\n"
+#: ../urpmi:541
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "kein webfetch gefunden, unterstützte webfetch sind: %s\n"
+msgid "Downloading package `%s'..."
+msgstr "Holen des Pakets „%s“ ..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "Prüfen der HD-Liste [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% von %s fertiggestellt, Dauer = %s, Geschwindigkeit = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "Lesen der HD-Liste ..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% fertiggestellt, Geschwindigkeit = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "schreibe Dateiliste für das Medium „%s“"
+msgid "The following packages have bad signatures"
+msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Do you want to continue installation ?"
+msgstr "Wollen Sie die Installation fortsetzen?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Das virtuelle Medium „%s“ sollte eine eindeutige URL haben, es wird ignoriert"
+"Installation fehlgeschlagen, einige Dateien fehlen:\n"
+"%s\n"
+"Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    -  Ausgabe des Attributs: Build host.\n"
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "Die Installation schlug Fehl"
 
-#: ../urpmi:1
+#: ../urpmi:665
 #, c-format
-msgid "Do nothing"
-msgstr "Nichts machen"
+msgid "distributing %s"
+msgstr "Verteile %s"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "Verwende assoziiertes Medium für den parallel Modus: %s"
+#: ../urpmi:673
+#, c-format
+msgid "installing %s"
+msgstr "Installiere %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "mounting %s"
-msgstr "Einhängen von „%s“"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installieren des Pakets „%s“ (%s/%s) ..."
+
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
+
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
+
+#: ../urpmi:772
+#, c-format
+msgid "%d installation transactions failed"
+msgstr "%d Installation schlugen Fehl"
+
+#: ../urpmi:780
+#, c-format
+msgid "Installation is possible"
+msgstr "Die Installation ist möglich"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
+msgid "Everything already installed"
+msgstr "Alles bereits installiert"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "starte urpmi neu"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"Das Medium „%s“ kann nicht verwendet werden, da die Dateiliste bereits von "
-"einem anderen Medium verwendet wird."
+"Verwendung: urpmi.addmedia [Optionen] <Name> <URL> [with <relativer Pfad>]>\n"
+"Mit <URL> aus folgender Menge:\n"
+"       file://<Pfad>\n"
+"       ftp://<Login>:<Passwort>@<Rechner>/<Pfad> with <relativer Pfad zur HD-"
+"Liste>\n"
+"       ftp://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
+"       http://<Rechner>/<Pfad> with <relativer Pfad zur HD-Liste>\n"
+"       removable://<Pfad>\n"
+"\n"
+"und [Optionen] aus\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"  --root         - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+"  --probe-synthesis - Versuche Synthesis Datei zu finden und zu nutzen.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% von %s fertiggestellt, Dauer = %s, Geschwindigkeit = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - versuche hdlist Datei zu finden und zu benutzen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "errechne md5sum der erhaltenen Quell HD Liste (oder Synthesis Liste)"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - versuche keine Synthesis oder\n"
+"                   HD-Liste zu finden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "kann die Beschreibungsdatei für „%s“ nicht importieren."
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatisch alle Medien von einem Installations-Medium\n"
+"                   erzeugen.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --no-uninstall - niemals fragen bei Paketdeinstallation, Installation "
-"abbrechen.\n"
+"  --distrib-XXX  - automatisches Erstellen eines Mediums für den XXX Teil\n"
+"                    einer Distribution, XXX kann main, contrib, updates "
+"oder\n"
+"                   irgendetwas anderes sein, das konfiguriert wurde ;-)\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"urpmq Version %s\n"
-"Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"Vertrieben werden.\n"
+"  --from         - nutze spezifizierte URL als Spiegelserverliste, die "
+"Vorgabe ist\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Hole HD-Liste (oder synthesis-Datei) von „%s“..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - nutze spezifizierte Distributionsversion, die "
+"Voreinstellung\n"
+"                           stammt aus der Version der Distribution, die in "
+"dem\n"
+"                   installierten mandrake-release Paket steht.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - benutze spezifizierte Architektur, die Voreinstellung ist "
+"die im\n"
+"                   mandrake-release Paket angegebene.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Das Medium „%s“ wurde nicht ausgewählt."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - erstelle virtuelle Medien, welche immer aktuell sind,\n"
+"                   nur das file:// Protokoll ist erlaubt.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Nur der Systemadministrator darf Pakete installieren."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "nutze spezielle Umgebung für %s\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - Löschen des Header-Verzeichnisses.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"Die HD-Liste für das Medium „%s“ wurde nicht gefunden, es wird ignoriert."
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - kleine Länge der Vorgänge, Voreinstellung ist %d.\n"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - Erzwinge das Erstellen einer HD-Liste.\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - linke Klammer zum Öffnen eines Gruppen Ausdrucks.\n"
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "Ich kann keine Aktualisierungen von Cooker einspielen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Es existieren zu viele Einhängpunkte für das Wechselmedium „%s“"
+msgid "retrieving mirrors at %s ..."
+msgstr "Holen der Spiegelserver-Liste von %s ..."
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"  -a             - binärer UND operator, wahr falls beide Ausdrücke wahr "
-"sind.\n"
+"nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Zugang zum Medium „%s“nicht möglich,\n"
-"das kann beim manuellen Mounten des Verzeichnisses des erstellten Mediums "
-"passieren."
+msgid "unable to update medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht aktualisieren.\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - Ausgabe des Attributs: Gruppe.\n"
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
+#: ../urpmi.addmedia:192
+#, c-format
+msgid "`with' missing for network media\n"
+msgstr "`with' fehlt für Netzwerk Medien.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "unmöglich den Vorgang einzuleiten"
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "Ich kann das Medium „%s“ nicht anlegen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Holen der RPMs von Medium  „%s“..."
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Verwendung: urpmi.removemedia [-a] <Name> ...\n"
+"Wobei <Name> das zu entfernende Medium ist.\n"
+
+#: ../urpmi.removemedia:37
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - Alle Medien auswählen.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
 "\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
-"Sie haben ein Quellpaket gewählt:\n"
-"\n"
-"%s\n"
-"Sie wollten es wahrscheinlich nicht auf dem Rechner installieren "
-"(installieren\n"
-" bietet die Möglichkeit den Quellcode zu ändern und zu kompilieren)\n"
 "\n"
-"Was wollen Sie machen?"
+"Unbekannte Optionen „%s“\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "Verteile %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Es gibt nichts zu entfernen (verwenden Sie „urpmi.addmedia“, \n"
+"um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "Die Installation schlug Fehl"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"Was soll entfernt werden?\n"
+"(eins aus %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "Schreiben der Konfigurationsdatei [%s]."
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Verwendung: urpmi.update [Optionen] <Name> ...\n"
+"Wobei <Name> das zu aktualisierende Medium ist.\n"
+
+#: ../urpmi.update:38
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - erzwinge Update auf gpg Schlüssel.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - Wählt alle nicht entfernbaren Medien..\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - Ausgabe des Attributs: Epoche.\n"
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Es gibt nichts zu aktualisieren (verwenden Sie „urpmi.addmedia“, \n"
+"um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - Überprüfung der RPM-Signatur vor der Installation.\n"
-"                   (--no-verify-rpm deaktiviert das Verhalten,\n"
-"                   Voreingestellt: Kontrolle der Signaturen).\n"
+"Was soll aktualisiert werden?\n"
+"(eins aus %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf Version %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
+"Verwendung:\n"
+
+#: ../urpmq:53
 #, 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“."
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - Alle verfügbaren Pakete auflisten.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - Alle verfügbaren Medien auflisten.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - Führe aktuelle Medien und ihre URL auf.\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+#: ../urpmq:56
+#, fuzzy, c-format
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - unscharfe Suche erzwingen (identisch zu „--fuzzy“).\n"
+"  --dump-config  - verwerfe die Konfiguration in der Form eines urpmi."
+"addmedia Argumentes.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes    - Alle  für „--parallel“ verfügbaren Knoten\n"
+"                    auflisten.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "Fehlerhafte HD-Liste in Datei „%s“"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases  - Alle verfügbaren Aliase auflisten.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "Entferne %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - Ausgabe von Header-Informationen über Pakete aus der "
+"urpmi-DB \n"
+"                   in die Standard-Ausgabe (nur root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automatisches Erstellen eines Mediums für den XXX Teil\n"
-"                    einer Distribution, XXX kann main, contrib, updates "
-"oder\n"
-"                   irgendetwas anderes sein, das konfiguriert wurde ;-)\n"
+"  --sources      - Gib alle Quellpakete vor dem Runterladen an (nur root).\n"
+".\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - Ausgabe des Attributs: Größe.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "um %s zu behalten"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - konfiguriere urpmi von einem distrib Baum.\n"
+"                   Das erlaubt eine Distribution zu befragen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, fuzzy, c-format
-msgid "due to unsatisfied %s"
-msgstr "wegen unbefriedigter %s "
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - Gebe Changelog aus.\n"
 
-#: ../_irpm:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Automatische Installation von Paketen ...\n"
-"Sie wünschen die Installation von Paket „%s“\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - Erweitere Anfrage auf Paket-Abhängigkeiten.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "urpmi database locked"
-msgstr "Die urpmi-Datenbank wird von einem anderen Prozess blockiert!"
-
-#: ../urpmi:1
-#, fuzzy, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --resume       - setze Transfer einer partiell-heruntergeladenen Datei "
-"fort\n"
-"                   (--no-resume deaktiviert es, Vorgabe ist deaktiviert).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "Holen der Beschreibungsdatei für „%s“ ..."
+"  -u             - Entferne Paket wenn bereits eine aktuellere Version "
+"installiert ist.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
+#: ../urpmq:80
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - komplette Ausgabe von zu entfernenden Paketen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Verwende Wechselmedium als „%s“"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverse search to what requires package.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Sie sind dabei folgendes Software Paket auf Ihrem Rechner zu installieren:\n"
-"\n"
-"%s\n"
-"\n"
-"Vielleicht bevorzugen Sie es nur zu speichern. Was ist Ihre Wahl?"
+"  -i             - Ausgabe von nützlichen Informationen in lesbarer Form.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - unscharfe Suche erzwingen (identisch zu „-y“).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - Ausgabe der Gruppe mit dem Namen.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - Entferne Paket wenn bereits eine aktuellere Version "
-"installiert ist.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - Ausgabe von Version und Release mit dem Namen.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - versuche hdlist Datei zu finden und zu benutzen.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - Dateien des Paketes auflisten.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "wegen fehlendem %s"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  Namen oder rpm-Dateien, die auf der Kommandozeile angegeben wurden werden "
+"abgefragt.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kann nur mit --parallel benutzt werden"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"Verwendung: urpmi.update [Optionen] <Name> ...\n"
-"Wobei <Name> das zu aktualisierende Medium ist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "Versuche existierendes Medium „%s“ zu umgehen, vermeidend"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - Versuch, ob die Installation korrekt verlaufen wird.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Eines der folgenden Pakete wird zur Installation von %s benötigt:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq Version %s\n"
+#~ "Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Dies ist freie Software und kann unter den Bedingungen der GNU GPL "
+#~ "weiter \n"
+#~ "Vertrieben werden.\n"
diff --git a/po/el.po b/po/el.po
index 1d73dc10..b10dc7a8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-06-14 23:30+0300\n"
 "Last-Translator:  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -38,1913 +38,1959 @@ msgstr "ΝνYy"
 msgid "Nn"
 msgstr "ΟοNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "εγκατάσταση %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Αυτόματη εγκατάσταση πακέτων...\n"
+"Ζητήσατε την εγκατάσταση του πακέτου %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "αδύνατο το άνοιγμα του rpmdb"
+msgid "Is this OK?"
+msgstr "Είναι εντάξει;"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
+msgid "Ok"
+msgstr "Εντάξει"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται για την εγκατάσταση του %s:"
+msgid "Cancel"
+msgstr "Άκυρο"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (Ν/ο) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: η εντολή δε βρέθηκε\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Όλα είναι ήδη εγκατεστημένα"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr ""
+msgid "unknown protocol defined for %s"
+msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
-"  --provides      - τύπωσε τις παροχές του tag: όλες τις παροχές (πολλαπλές "
-"γραμμές)."
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ποιά είναι η επιλογή σας; (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "αδυναμία χειρισμού πρωτόκολλου: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "βρέθηκαν %d κεφαλίδες στην cache"
+msgid "syntax error in config file at line %s"
+msgstr "συντακτικό λάθος στο αρχείο ρυθμίσεων στη γραμμή %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένο hdlist, "
+"το μέσο θα αγνοηθεί"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
+"μέσο θα αγνοηθεί"
+
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"αδυναμία ελέγχου του μέσου \"%s\" καθώς το αρχείο λίστας ήδη χρησιμοποιείται "
+"από άλλο μέσο"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"αδυναμία χρήσης ονόματος \"%s\" για το ανώνυμο μέσο γιατί ήδη χρησιμοποιείται"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ανάκτηση αρχείου rpm [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"αδυνατώ να λάβω υπ' όψιν το μέσο \"%s\" καθώς δεν υπάρχει αρχείο λίστας [%s]"
+
+#: ../urpm.pm:213
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "αδυναμία καθορισμού του μέσου αυτού του αρχείου hdlist [%s]"
+
+#: ../urpm.pm:222
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "αδυναμία πρόσβασης στο αρχείο hdlist του \"%s\", το μέσο θα αγνοηθεί"
+
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "αδυναμία πρόσβασης στο αρχείο λίστας του \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpmq:1
+#: ../urpm.pm:249
 #, fuzzy, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "προσπάθεια αποφυγής υπάρχοντος μέσου \"%s\""
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
+"το μέσο θα αγνοηθεί"
+
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
+"μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:271
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "... η ανάκτηση απέτυχε: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο θα αγνοηθεί"
+
+#: ../urpm.pm:278
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
+
+#: ../urpm.pm:309
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "αδυναμία επιθεώρησης αρχείου λίστας για το \"%s\", το μέσο θα αγνοηθεί"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Package installation..."
-msgstr "Εγκατάσταση πακέτου..."
+msgid "taking removable device as \"%s\""
+msgstr "λήψη της αφαιρούμενης συσκευής ως \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:347
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "λάθος όνομα αρχείου rpm [%s]"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής  [%s] για το \"%s\""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "αδυναμία ανάκτησης του ονόματος θέσης του αφαιρούμενου μέσου \"%s\""
+
+#: ../urpm.pm:368
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
+
+#: ../urpm.pm:390
+#, c-format
+msgid "write config file [%s]"
+msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
+
+#: ../urpm.pm:402
+#, c-format
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Η εγκατάσταση απέτυχε"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "αδυναμία πρόσβασης στο rpm αρχείο [%s]"
+
+#: ../urpm.pm:423
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "ανάγνωση αρχείου hdlist [%s]"
+
+#: ../urpm.pm:433
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "ανάγνωση αρχείου hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr ""
+
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "αδυναμία χρήσης της επιλογής parallel \"%s\""
+
+#: ../urpm.pm:452
+#, fuzzy, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης (δεν βρέθηκε αρχείο Mandrake/"
-"base/hdlists)"
+"το --synthesis δεν μπορεί να χρησιμοποιηθεί με --media, --update ή --parallel"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
+msgid "examining synthesis file [%s]"
+msgstr "εξέταση αρχείου synthesis [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "Choose location to save file"
+msgid "examining hdlist file [%s]"
+msgstr "εξέταση αρχείου hdlist [%s]"
+
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
+"μέσο θα αγνοηθεί"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - τύπωσε την περίληψη της ετικέτας: περίληψη.\n"
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
+#, fuzzy, c-format
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Η εγκατάσταση απέτυχε"
+msgid "skipping package %s"
+msgstr "κανένα πακέτο με το όνομα %s"
+
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - χρήση διεπαφής X.\n"
+msgid "unable to open rpmdb"
+msgstr "αδύνατο το άνοιγμα του rpmdb"
 
-#: ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
+msgid "medium \"%s\" already exists"
+msgstr "το μέσο \"%s\" υπάρχει ήδη"
 
-#: ../urpme:1
+#: ../urpm.pm:629
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "virtual medium need to be local"
 msgstr ""
-"Για να ικανοποιηθούν οι εξαρτήσεις (dependencies), τα παρακάτω πακέτα θα "
-"αφαιρεθούν (%d MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+msgid "added medium %s"
+msgstr "προστίθεται το μέσο %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+#: ../urpm.pm:677
+#, c-format
+msgid "unable to access first installation medium"
+msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "έγινε"
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "αντιγραφή αρχείου hdlist..."
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, c-format
+msgid "...copying failed"
+msgstr "...η αντιγραφή απέτυχε"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...η αντιγραφή ολοκληρώθηκε"
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"  --auto-select  - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
-"συστήματος.\n"
+"αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης (δεν βρέθηκε αρχείο Mandrake/"
+"base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "no package named %s"
-msgstr "κανένα πακέτο με το όνομα %s"
+msgid "retrieving hdlists file..."
+msgstr "ανάκτηση αρχείου hdlists..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...η ανάκτηση ολοκληρώθηκε"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Η εγκατάσταση απέτυχε, ορισμένα αρχεία λείπουν:\n"
-"%s\n"
-"Ίσως να θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
+msgid "...retrieving failed: %s"
+msgstr "... η ανάκτηση απέτυχε: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "λάθος περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
+
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "προσπάθεια επιλογής μη υπαρκτού μέσου \"%s\""
+
+#: ../urpm.pm:767
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr "επιλογής πολλαπλών μέσων: %s"
+
+#: ../urpm.pm:767
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: ../urpm.pm:783
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "αφαίρεση μέσου \"%s\""
+
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"χρήση: urpmi.removemedia [-a] <όνομα> ...\n"
-"όπου <όνομα> είναι ένα μέσο προς διαγραφή.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:996
 #, fuzzy, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
-"%s\n"
-"συμφωνείτε;"
+"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
+"το μέσο θα αγνοηθεί"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "αντιγραφή αρχείου περιγραφής για το \"%s\"..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "το `with' λείπει από το ftp media\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "εξέταση αρχείου MD5SUM"
+
+#: ../urpm.pm:1092
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+
+#: ../urpm.pm:1105
+#, fuzzy, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "το wget του [%s] απέτυχε (ίσως λείπει το wget;)"
+
+#: ../urpm.pm:1109
+#, fuzzy, c-format
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "η αντιγραφή του [%s] απέτυχε"
 
-#: ../urpme:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "unknown package"
-msgstr "άγνωστο πακέτο"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Installation is possible"
-msgstr "Η εγκατάσταση είναι δυνατή"
+msgid "reading rpm files from [%s]"
+msgstr "ανάγνωση αρχείων rpm από το [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
+#, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
+
+#: ../urpm.pm:1204
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
+
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
-"%s\n"
-"συμφωνείτε;"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "ανάκτηση πηγαίου hdlist (ή synthesis) για το \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα θα εγκατασταθούν (%d "
-"MB)"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
+
+#: ../urpm.pm:1398
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "md5sum mismatch"
 msgstr ""
-"αδυνατώ να λάβω υπ' όψιν το μέσο \"%s\" καθώς δεν υπάρχει αρχείο λίστας [%s]"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:1483
+#, fuzzy, c-format
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
+
+#: ../urpm.pm:1490
 #, c-format
-msgid " (y/N) "
-msgstr " (ν/Ο) "
+msgid "no hdlist file found for medium \"%s\""
+msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "δεν μπορώ να προσθέσω αναβαθμίσεις για τις διανομές cooker\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "το αρχείο [%s] ήδη χρησιμοποιείται για το ίδιο μέσο \"%s\""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - αναλυτική λειτουργία.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "αδυναμία ανάγνωσης του hdlist αρχείου του \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "Initializing..."
-msgstr "Αρχικοποίηση..."
+msgid "unable to write list file of \"%s\""
+msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "εγγραφή αρχείου λίστας για το μέσο \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, fuzzy, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "το μέσο \"%s\" έχει αναφερθεί σαν αφαιρούμενο αλλά δεν είναι"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "ανάκτηση αρχείου περιγραφής για το \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
-"το μέσο θα αγνοηθεί"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+msgid "unable to import pubkey file of \"%s\""
+msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "reading headers from medium \"%s\""
+msgstr "ανάγνωση κεφαλίδων από το μέσο \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Πατήστε enter όταν τελειώσετε..."
+msgid "building hdlist [%s]"
+msgstr "δημιουργία hdlist [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"άγνωστες επιλογές '%s'\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "δημιουργία αρχείου σύνθεσης hdlist από το μέσο \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "found %d headers in cache"
+msgstr "βρέθηκαν %d κεφαλίδες στην cache"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
+#: ../urpm.pm:1749
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "διαγραφή %d απαρχαιωμένων επικεφαλίδων από την cache"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgid "mounting %s"
+msgstr "προσαρτώ το %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "unmounting %s"
+msgstr "αποπροσαρτώ %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:1928
 #, fuzzy, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
+msgid "relocated %s entries in depslist"
+msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "δημιουργία hdlist [%s]"
+#: ../urpm.pm:1929
+#, fuzzy, c-format
+msgid "no entries relocated in depslist"
+msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "λάθος όνομα αρχείου rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "εξέταση αρχείου MD5SUM"
+msgid "retrieving rpm file [%s] ..."
+msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: η εντολή δε βρέθηκε\n"
+msgid "unable to access rpm file [%s]"
+msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
 msgid "unable to register rpm file"
 msgstr "αδυναμία εγγραφής του αρχείου rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+msgid "error registering local packages"
+msgstr "σφάλμα κατά την εγγραφή των τοπικών πακέτων"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "αδυναμία χειρισμού πρωτόκολλου: %s"
+msgid "no package named %s"
+msgstr "κανένα πακέτο με το όνομα %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "ανάκτηση αρχείου hdlists..."
+msgid "The following packages contain %s: %s"
+msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "added medium %s"
-msgstr "προστίθεται το μέσο %s"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "αδυναμία σωστής απόδοσης του [%s] στην τιμή \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, fuzzy, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
-
-#: ../urpm.pm:1
-#, c-format
 msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
+"το μέσο \"%s\" χρησιμοποιεί άκυρο αρχείο λίστας ( ο διακομιστής μάλλον δεν "
+"είναι ενημερωμένος, προσπάθεια χρήσης εναλλακτικής μεθόδου)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "md5sum mismatch"
-msgstr ""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "το μέσο \"%s\" δεν καθορίζει κάποια θέση για τα αρχεία rpm"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "συντακτικό λάθος στο αρχείο ρυθμίσεων στη γραμμή %s"
+msgid "package %s is not found."
+msgstr "το πακέτο %s δεν βρέθηκε."
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
+msgid "urpmi database locked"
+msgstr "κλειδωμένη βάση δεδομένων urpmi"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
+msgid "medium \"%s\" is not selected"
+msgstr "το μέσο \"%s\" δεν έχει επιλεγεί"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "in order to install %s"
-msgstr "για να εγκατασταθεί το %s"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "αδυναμία ανάγνωσης του αρχείου rpm [%s] από το μέσο \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, fuzzy, c-format
-msgid "relocated %s entries in depslist"
-msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "το μέσο \"%s\" έχει αναφερθεί σαν αφαιρούμενο αλλά δεν είναι"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  --group         - τύπωση το tag group: group."
+#: ../urpm.pm:2574
+#, c-format
+msgid "unable to access medium \"%s\""
+msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
+msgid "malformed input: [%s]"
+msgstr "κακοδιατυπωμένη είσοδος: [%s]"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+#: ../urpm.pm:2642
+#, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "ανάκτηση [%s]"
+#: ../urpm.pm:2719 ../urpmi:686
+#, c-format
+msgid "Preparing..."
+msgstr "Προετοιμασία..."
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --serial        - τύπωσε την ετικέτα serial: serial."
+#: ../urpm.pm:2752
+#, c-format
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "καθορίστηκε άγνωστο πρωτόκολλο για το %s"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
+msgid "unable to create transaction"
+msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "removing package %s"
+msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
+msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+
+#: ../urpm.pm:2806
+#, c-format
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
-"  --obsoletes     - τύπωσε τις απαρχαιωμένες ετικέτες : όλες τις "
-"απαρχαιωμένες (πολλαπλές γραμμές).\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "το μέσο \"%s\" υπάρχει ήδη"
+msgid "unable to install package %s"
+msgstr "αδυναμία εγκατάστασης του πακέτου %s"
 
-#: ../_irpm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "installing %s\n"
-msgstr "εγκατάσταση %s\n"
+msgid "due to missing %s"
+msgstr "λόγω ελλείψεων %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"η επιλογή για αναβάθμιση λείπει\n"
-"(ένα εκ των %s)\n"
+msgid "due to unsatisfied %s"
+msgstr "λόγω μη ικανοποίησης %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "selecting %s by selection on files"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to remove package %s"
-msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+#: ../urpm.pm:3012
+#, fuzzy, c-format
+msgid "in order to keep %s"
+msgstr "για να εγκατασταθεί το %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "πρόβλημα κατά την ανάγνωση του αρχείου synthesis από το μέσο \"%s\""
+msgid "in order to install %s"
+msgstr "για να εγκατασταθεί το %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"η επιλογή προς διαγραφή λείπει\n"
-"(ένα εκ των %s)\n"
+msgid "due to conflicts with %s"
+msgstr "λόγω σύγκρουσεων με το %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - επιλογή όλων των μέσων.\n"
+msgid "unrequested"
+msgstr "δεν ζητήθηκαν"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "Missing signature (%s)"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
+msgid "Invalid Key ID (%s)"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "το wget του [%s] απέτυχε (ίσως λείπει το wget;)"
-
-#: ../urpmi.update:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης\n"
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid " (Y/n) "
-msgstr " (Ν/ο) "
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Λυπάμαι, κακή επιλογή, προσπαθήστε ξανά\n"
 
-#: ../urpm.pm:1
+#: ../urpme:36
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
-"μέσο θα αγνοηθεί"
+"urpme έκδοση %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
+"GNU GPL.\n"
+"\n"
+"χρήση:\n"
 
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "κακοδιατυπωμένη είσοδος: [%s]"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../urpme:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σας"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - αυτόματη επιλογή πακέτου στις επιλογές.\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - επαλήθευση ότι η εγκατάσταση μπορεί να επιτευχθεί σωστά.\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
+#, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
-"%s\n"
-"συμφωνείτε ;"
 
-#: ../urpmi:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid "no entries relocated in depslist"
-msgstr "επανεντόπιση %s καταχωρήσεων στο depslist"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:1
+#: ../urpme:47
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - αναλυτική λειτουργία.\n"
 
-#: ../urpmf:1
+#: ../urpme:50
 #, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi:1
+#: ../urpme:83
 #, c-format
-msgid "do you agree ?"
-msgstr ""
+msgid "unknown packages"
+msgstr "άγνωστα πακέτα"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
+msgid "unknown package"
+msgstr "άγνωστο πακέτο"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpme:93
 #, c-format
-msgid "...retrieving done"
-msgstr "...η ανάκτηση ολοκληρώθηκε"
+msgid "removing package %s will break your system"
+msgstr "η αφαίρεση του πακέτου %s θα καταστρέψει το σύστημά σας"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "Nothing to remove"
+msgstr "Τίποτα προς αφαίρεση"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "κανένα πακέτο με το όνομα %s"
+#: ../urpme:99
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις (dependencies), τα παρακάτω πακέτα θα "
+"αφαιρεθούν (%d MB)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid " (y/N) "
+msgstr " (ν/Ο) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "Η αφαίρεση απέτυχε"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpmi έκδοση %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf έκδοση %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
 "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
-"GNU GPL.\n"
+"GNU GPL..\n"
 "\n"
 "χρήση:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "αδυναμία σωστής απόδοσης του [%s] στην τιμή \"%s\""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "αδυναμία καθορισμού του μέσου αυτού του αρχείου hdlist [%s]"
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "αδυναμία ανάγνωσης του hdlist αρχείου του \"%s\""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένο hdlist, "
-"το μέσο θα αγνοηθεί"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
+#, fuzzy, c-format
+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:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
+
+#: ../urpmf:42
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "λόγω σύγκρουσεων με το %s"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "διαγραφή %d απαρχαιωμένων επικεφαλίδων από την cache"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
 
-#: ../urpmi:1
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - τύπωση το μέγεθος του tag: μέγεθος."
+
+#: ../urpmf:46
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (ν/Ο) "
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - τύπωσε την περίληψη της ετικέτας: περίληψη.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - τύπωσε την περιγραφή της ετικέτας: περιγραφή.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
+
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
-"μέσο θα αγνοηθεί"
+"  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
+"γραμμές).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
-msgstr "Προετοιμασία..."
+#: ../urpmf:51
+#, fuzzy, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --serial        - τύπωσε την ετικέτα serial: serial."
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:52
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - τύπωσε τις παροχές του tag: όλες τις παροχές (πολλαπλές "
+"γραμμές)."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής  [%s] για το \"%s\""
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires      - τύπωσε την ετικέτα απαιτήσεων: όλες οι απαιτήσεις "
+"(πολλαπλές γραμμές).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:54
 #, fuzzy, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr ""
+"  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
+"γραμμές).\n"
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts     - τύπωσε τις συγκρούσεις ετικετών: όλες τις συγκρούσεις "
+"(πολλαπλές γραμμές).\n"
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - τύπωσε τις απαρχαιωμένες ετικέτες : όλες τις "
+"απαρχαιωμένες (πολλαπλές γραμμές).\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
+#, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
-"                    synthesis hdlist.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpm.pm:1
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf:61
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "η αντιγραφή του [%s] απέτυχε"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:64
 #, fuzzy, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  --group         - τύπωση το tag group: group."
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"αδυναμία χρήσης ονόματος \"%s\" για το ανώνυμο μέσο γιατί ήδη χρησιμοποιείται"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
-"  --conflicts     - τύπωσε τις συγκρούσεις ετικετών: όλες τις συγκρούσεις "
-"(πολλαπλές γραμμές).\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmf:150
+#, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη hdlist, "
-"το μέσο θα αγνοηθεί"
 
-#: ../urpme:1
+#: ../urpmi:72
 #, c-format
 msgid ""
-"urpme version %s\n"
+"urpmi version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpme έκδοση %s\n"
+"urpmi έκδοση %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
 "GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"χρήση: urpmi.addmedia [--update] <name> <url>\n"
-"όπου <url> είναι ένα εκ των\n"
-"       file://<διαδρομή>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable_<συσκευή>://<path>\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
-
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "...copying done"
-msgstr "...η αντιγραφή ολοκληρώθηκε"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "αδυναμία χρήσης της επιλογής parallel \"%s\""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"το μέσο \"%s\" χρησιμοποιεί άκυρο αρχείο λίστας ( ο διακομιστής μάλλον δεν "
-"είναι ενημερωμένος, προσπάθεια χρήσης εναλλακτικής μεθόδου)"
+"  --auto-select  - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:85
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "virtual medium need to be local"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "error registering local packages"
-msgstr "σφάλμα κατά την εγγραφή των τοπικών πακέτων"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:91
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, fuzzy, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:94
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:1
+#: ../urpmi:96
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "unable to install package %s"
-msgstr "αδυναμία εγκατάστασης του πακέτου %s"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:104
 #, c-format
-msgid "Save file"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
+"  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
+"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "αδυναμία ανάκτησης του ονόματος θέσης του αφαιρούμενου μέσου \"%s\""
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:109
 #, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
-"                    synthesis hdlist.\n"
+"\n"
+" ενεργοποιημένο"
 
-#: ../urpmi:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "η <σχετική διαδρομή του hdlist> λείπει\n"
-
-#: ../urpme:1
+#: ../urpmi:115
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "unrequested"
-msgstr "δεν ζητήθηκαν"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - χρήση διεπαφής X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "αδυναμία πρόσβασης στο αρχείο rpm [%s]"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
-"γραμμές).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "αδυναμία πρόσβασης στο rpm αρχείο [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "αδυναμία ανάγνωσης του αρχείου rpm [%s] από το μέσο \"%s\""
-
-#: ../urpmi:1
-#, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
+"\n"
+" ενεργοποιημένο"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "δημιουργία αρχείου σύνθεσης hdlist από το μέσο \"%s\""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:126
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:128
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, fuzzy, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "αποπροσαρτώ %s"
+#: ../urpmi:130 ../urpmq:83
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmi.update:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
+"  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
+"src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ολοκληρώθηκε, ταχύτητα = %s"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid "restarting urpmi"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "εξέταση αρχείου synthesis [%s]"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (ν/Ο) "
+#: ../urpmi:197
+#, fuzzy, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "έγινε"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "...copying failed"
-msgstr "...η αντιγραφή απέτυχε"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "αδυναμία πρόσβασης στο αρχείο hdlist του \"%s\", το μέσο θα αγνοηθεί"
+msgid "Do nothing"
+msgstr "Να μη γίνει τίποτα"
 
-#: ../urpmi:1
+#: ../urpmi:213
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - σιωπηλή λειτουργία.\n"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Η εγκατάσταση απέτυχε"
+
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:240
 #, c-format
-msgid "unknown packages"
-msgstr "άγνωστα πακέτα"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "αδυναμία δημιουργίας καταλόγου [%s] για την αναφορά σφάλματος"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "επιλογής πολλαπλών μέσων: %s"
+msgid "Copying failed"
+msgstr "Η αντιγραφή απέτυχε"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:260
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
+msgid "Only superuser is allowed to install packages"
+msgstr "Μόνο ο υπερχρήστης επιτρέπεται να εγκαταστήσει πακέτα"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "το αρχείο [%s] ήδη χρησιμοποιείται για το ίδιο μέσο \"%s\""
+msgid "One of the following packages is needed:"
+msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:403
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"τίποτα για διαγραφή (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Ποιά είναι η επιλογή σας; (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο θα αγνοηθεί"
+msgid "Package installation..."
+msgstr "Εγκατάσταση πακέτου..."
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθειας.\n"
+msgid "Initializing..."
+msgstr "Αρχικοποίηση..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "ανάγνωση αρχείου hdlist [%s]"
-
-#: ../urpmf:1
-#, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
+"Ορισμένα πακέτα που ζητήθηκαν δεν μπορούν να εγκατασταθούν:\n"
+"%s\n"
+"συμφωνείτε ;"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  --group         - τύπωση το tag group: group."
-
-#: ../urpmf:1
+#: ../urpmi:440 ../urpmi:466
 #, 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"
+msgid "do you agree ?"
 msgstr ""
-"urpmf έκδοση %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
-"GNU GPL..\n"
-"\n"
-"χρήση:\n"
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --quiet         - μην τυπώσεις το όνομα tag (εξ' ορισμού αν κανένα tag δεν "
-"δοθεί στην γραμμή"
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"%s\n"
+"συμφωνείτε;"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"%s\n"
+"συμφωνείτε;"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, fuzzy, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"το --synthesis δεν μπορεί να χρησιμοποιηθεί με --media, --update ή --parallel"
+"Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα θα εγκατασταθούν (%d "
+"MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
+"Πρέπει να είστε root για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Is this OK?"
-msgstr "Είναι εντάξει;"
+msgid "unable to get source packages, aborting"
+msgstr "αδυναμία λήψης των πηγαίων (source) πακέτων, εγκατάλειψη"
 
-#: ../urpmi:1
+#: ../urpmi:540
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
+msgid "Press Enter when ready..."
+msgstr "Πατήστε enter όταν τελειώσετε..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ανάγνωση αρχείου hdlist [%s]"
+msgid "Downloading package `%s'..."
+msgstr "αδυναμία αφαίρεσης του πακέτου %s"
 
-#: ../urpme:1
+#: ../urpmi:597
 #, c-format
-msgid "Nothing to remove"
-msgstr "Τίποτα προς αφαίρεση"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% από %s ολοκληρώθηκε, ETA = %s, ταχύτητα = %s"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ολοκληρώθηκε, ταχύτητα = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "ανάγνωση κεφαλίδων από το μέσο \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "Τα παρακάτω πακέτα περιέχουν κακές υπογραφές"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Η εγκατάσταση απέτυχε, ορισμένα αρχεία λείπουν:\n"
+"%s\n"
+"Ίσως να θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "το μέσο \"%s\" δεν καθορίζει κάποια θέση για τα αρχεία rpm"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
+msgid "Installation failed"
+msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpmf:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr ""
-"  --requires      - τύπωσε την ετικέτα απαιτήσεων: όλες οι απαιτήσεις "
-"(πολλαπλές γραμμές).\n"
+msgid "distributing %s"
+msgstr "εγκατάσταση %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "προσπάθεια επιλογής μη υπαρκτού μέσου \"%s\""
+msgid "installing %s"
+msgstr "εγκατάσταση %s\n"
 
-#: ../urpmf:1
+#: ../urpmi:688
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - τύπωσε την περιγραφή της ετικέτας: περιγραφή.\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
 
-#: ../urpmi:1
+#: ../urpmi:712
 #, c-format
-msgid "Copying failed"
-msgstr "Η αντιγραφή απέτυχε"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Προσπάθεια για εγκατάσταση χωρίς τον έλεγχο των εξαρτήσεων; (ν/Ο) "
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:731
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Προσπάθεια για πιο δυνατή εγκατάσταση (--force); (ν/Ο) "
 
-#: ../urpmq:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --all           - τύπωσε όλα τα tags."
+msgid "%d installation transactions failed"
+msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
+msgid "Installation is possible"
+msgstr "Η εγκατάσταση είναι δυνατή"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:783
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Everything already installed"
+msgstr "Όλα είναι ήδη εγκατεστημένα"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
 msgstr ""
-"  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
-"src).\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "εγκατάσταση %s\n"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"χρήση: urpmi.addmedia [--update] <name> <url>\n"
+"όπου <url> είναι ένα εκ των\n"
+"       file://<διαδρομή>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable_<συσκευή>://<path>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "ανάγνωση αρχείων rpm από το [%s]"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "αντιγραφή αρχείου περιγραφής για το \"%s\"..."
+#: ../urpmi.addmedia:56
+#, fuzzy, c-format
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
+"                    synthesis hdlist.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - αυτόματη επιλογή πακέτου στις επιλογές.\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpme:1
-#, c-format
-msgid "Removing failed"
-msgstr "Η αφαίρεση απέτυχε"
+#: ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
+"                    synthesis hdlist.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "package %s is not found."
-msgstr "το πακέτο %s δεν βρέθηκε."
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "αφαίρεση μέσου \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "Cancel"
-msgstr "Άκυρο"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "αδυναμία πρόσβασης στο μέσο \"%s\""
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - αναγκαστική δημιουργία αρχείων hdlist.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "δεν μπορώ να προσθέσω αναβαθμίσεις για τις διανομές cooker\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "ανάκτηση [%s]"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "η χρειάζεται να δώσετε <σχετική διαδρομή του hdlist>  με το --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"Πρέπει να είστε root για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
-"%s\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "αδυναμία πρόσβασης στο αρχείο λίστας του \"%s\", το μέσο θα αγνοηθεί"
+msgid "<relative path of hdlist> missing\n"
+msgstr "η <σχετική διαδρομή του hdlist> λείπει\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
+msgid "`with' missing for network media\n"
+msgstr "το `with' λείπει από το ftp media\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "unable to create medium \"%s\"\n"
+msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "εξέταση αρχείου hdlist [%s]"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"χρήση: urpmi.removemedia [-a] <όνομα> ...\n"
+"όπου <όνομα> είναι ένα μέσο προς διαγραφή.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "copying hdlists file..."
-msgstr "αντιγραφή αρχείου hdlist..."
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - επιλογή όλων των μέσων.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "εγγραφή αρχείου λίστας για το μέσο \"%s\""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, το "
-"μέσο θα αγνοηθεί"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --files         - τύπωσε τα αρχεία ετικέτας: όλα τα αρχεία (πολλαπλές "
-"γραμμές).\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do nothing"
-msgstr "Να μη γίνει τίποτα"
+"\n"
+"άγνωστες επιλογές '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"τίποτα για διαγραφή (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "mounting %s"
-msgstr "προσαρτώ το %s"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"η επιλογή προς διαγραφή λείπει\n"
+"(ένα εκ των %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
-"αδυναμία ελέγχου του μέσου \"%s\" καθώς το αρχείο λίστας ήδη χρησιμοποιείται "
-"από άλλο μέσο"
+"χρήση:urpmi.update [επιλογές] <όνομα> ...\n"
+"όπου <όνομα> είναι ένα μέσο προς αναβάθμιση.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:38
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "αδυναμία λήψης των πηγαίων (source) πακέτων, εγκατάλειψη"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης\n"
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
-"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:41
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% από %s ολοκληρώθηκε, ETA = %s, ταχύτητα = %s"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "η ανάκτηση του πηγαίου hdlist (ή synthesis) απέτυχε"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - επιλογή όλων των μη αφαιρούμενων μέσων.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "αδυναμία εγγραφής αρχείου λίστας του \"%s\""
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για προσθήκη μέσου)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"η επιλογή για αναβάθμιση λείπει\n"
+"(ένα εκ των %s)\n"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Copyright (C) 2000-2004 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"
+"urpmf έκδοση %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
 "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
-"GNU GPL.\n"
+"GNU GPL..\n"
 "\n"
 "χρήση:\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "ανάκτηση πηγαίου hdlist (ή synthesis) για το \"%s\"..."
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  --group         - τύπωση το tag group: group."
-
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "το μέσο \"%s\" δεν έχει επιλεγεί"
-
-#: ../urpmi:1
-#, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Μόνο ο υπερχρήστης επιτρέπεται να εγκαταστήσει πακέτα"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:54
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο θα αγνοηθεί"
+#: ../urpmq:55
+#, fuzzy, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
 
-#: ../urpmi:1
+#: ../urpmq:56
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:57
 #, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
+#: ../urpmq:58
+#, fuzzy, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmf:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - τύπωση την ετικέτα της ομάδας: ομάδα.\n"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - χρήση των μέσων που δίδονται, χωρισμένα με κόμμα.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ανάκτηση αρχείων rpm από το μέσο \"%s\"..."
-
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:75
 #, fuzzy, c-format
-msgid "distributing %s"
-msgstr "εγκατάσταση %s\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installation failed"
-msgstr "Η εγκατάσταση απέτυχε"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "write config file [%s]"
-msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - επιλογή όλων των μη αφαιρούμενων μέσων.\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - τύπωσε όλα τις ετικέτες.\n"
 
-#: ../urpmf:1
+#: ../urpmq:77
 #, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - τύπωση το μέγεθος του tag: μέγεθος."
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpmq:78
+#, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"\n"
-" ενεργοποιημένο"
-
-#: ../urpmi:1
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Παρακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
+"  -u             - αφαίρεση πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη "
+"εγκατεστημένη.\n"
 
-#: ../urpmq:1
+#: ../urpmq:80
 #, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - εμφάνιση διαθέσιμων μέσων.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:82
 #, fuzzy, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  --all           - τύπωσε όλα τα tags."
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Εντάξει"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "λάθος περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:85
 #, fuzzy, c-format
-msgid "removing %s"
-msgstr "αδυναμία αφαίρεσης του πακέτου %s"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
-msgstr ""
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - τύπωση το μέγεθος της ετικέτας: μέγεθος.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "για να εγκατασταθεί το %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "λόγω μη ικανοποίησης %s"
-
-#: ../_irpm:1
-#, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Αυτόματη εγκατάσταση πακέτων...\n"
-"Ζητήσατε την εγκατάσταση του πακέτου %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "κλειδωμένη βάση δεδομένων urpmi"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  --group         - τύπωση το tag group: group."
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"\n"
-" ενεργοποιημένο"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "                    γραμμή εντολών αλλά χωρίς όνομα πακέτου)."
 
-#: ../urpm.pm:1
+#: ../urpmq:89
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "ανάκτηση αρχείου περιγραφής για το \"%s\"..."
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "λήψη της αφαιρούμενης συσκευής ως \"%s\""
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - εμφάνιση διαθέσιμων πακέτων.\n"
 
-#: ../urpmi:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, fuzzy, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr "  --all           - τύπωσε όλα τα tags."
 
-#: ../urpmq:1
-#, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - αφαίρεση πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη "
-"εγκατεστημένη.\n"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:327
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to missing %s"
-msgstr "λόγω ελλείψεων %s"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "δεν βρέθηκε πλήρης λίστα μέσων"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"χρήση:urpmi.update [επιλογές] <όνομα> ...\n"
-"όπου <όνομα> είναι ένα μέσο προς αναβάθμιση.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "προσπάθεια αποφυγής υπάρχοντος μέσου \"%s\""
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται για την εγκατάσταση του %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - επαλήθευση ότι η εγκατάσταση μπορεί να επιτευχθεί σωστά.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq έκδοση %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανέμεται υπό τους όρους του "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "χρήση:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Άγνωστο webfetch `%s' !!!\n"
@@ -2110,9 +2156,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "προσπαθήστε με urpmf --help για περισσότερες επιλογές"
 
-#~ msgid "no full media list was found"
-#~ msgstr "δεν βρέθηκε πλήρης λίστα μέσων"
-
 #, fuzzy
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
diff --git a/po/eo.po b/po/eo.po
index c332225d..60186e1a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-08-22 15:28+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -38,865 +38,771 @@ msgstr "YyJj"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalas %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - kreas aŭtomate ĉiujn datenportilojn de instala\n"
-"                   datenportilo.\n"
+"Aŭtomata instalado de pakaĵoj...\n"
+"Vi mendis instaladon de pakaĵo %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "ne povis malfermi rpmdb"
+msgid "Is this OK?"
+msgstr "Ĉu tio estas bona?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
+msgid "Ok"
+msgstr "Jes"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Nuligu"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "mi forigas la pakaĵon %s"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: ordono ne trovata\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "ĉio jam instalita"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - presu tiun ĉi help-mesaĝon.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - printu etikedo-grupon: group.\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - purigu la dosieron de kap-kaŝejo.\n"
+msgid "unknown protocol defined for %s"
+msgstr "nekonata protokolo difinita por %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
+msgid "unable to handle protocol: %s"
+msgstr "ne povas uzi la protokolon: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kiu estas via elekto? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "sintakseraro en konfigura dosiero ĉe linio %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "trovis %d ĉapdosierojn en kaŝejo"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"datenportilo \"%s\" provas uzi jam uzitan hdlist, datenportilo ignorata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"ekzistas plurajn pakaĵojn kiuj havas la saman rpm-an dosiernomon \"%s\""
+"datenportilo \"%s\" provis uzi jam uzitan liston, ignoras datenportilon"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - difinu uzulon kaj pasvorton por uzi prokuran\n"
-"                   aŭtentigon (formato estas <uzulo:pasvorto>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "ne povis trakti pri medion \"%s\" ĉar alia medio jam uzas listdosieron"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "mi faras duan pason por kalkuli dependaĵojn\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ne povis uzi nomon \"%s\" por sennoma medio ĉar ĝi jam estas uzata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "mi ekstraktas rpm-dosieron [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne povis konsideri medion \"%s\" ĉar ne ekzistas listdosieron [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - listigu haveblajn paralelajn kromnomojn.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne povis determini medion de ĉi tiu \"hdlist\" dosiero [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ekstraktado malsukcesis: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binara AŬ-operatoro, vera se unu esprimo estas vera.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Instalado de pakaĵo..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuala datenportilo \"%s\" ne havu difinitan hdlist aŭ list-dosieron, "
+"datenportilo ignorata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nevalida rpm-a dosiernomo [%s]"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuala datenportilo \"%s\" havu klaran url, datenportilo ignorata"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "La instal-transakcio %d malsukcesis"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"neeblas aliri la unuan instal-datenportilon (ne troviĝis dosieroMandrake/"
-"base/hdlists)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekohera listdosiero por \"%s\", medio ignorita"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne povas inspekti listdosieron por \"%s\", ignoris medion"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --group         - printu etikedan resumon: summary.\n"
+msgid "taking removable device as \"%s\""
+msgstr "prenante moveblan aparaton kiel \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalado malsukcesis"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - uzu X-interfacon.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
+msgid "unable to write config file [%s]"
+msgstr "ne povas skribi konfigurodosieron [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas forigotaj (%d mb)"
+msgid "write config file [%s]"
+msgstr "skribu konfiguran dosieron [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - elektu la plej bonan interfacon laŭ la medio:\n"
-"                   X- aŭ tekst-modo.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Mi deŝutas pakaĵon '%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne povis analizi \"%s\" en dosiero [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Kio fareblas per binaraj rpm-dosieroj se uzante --install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "mi kontrolas la paralelan traktilon en dosiero [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "trovis paralelan traktilon por nodoj: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "neniu pakaĵo nomata %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "uzanta asociitaj datenportiloj por paralela modo: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - elektu ĉiujn kongruojn en la komanda linio.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "ne povis uzi paralelan opcion \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Instalado malsukcesis, kelkaj dosieroj mankas:\n"
-"%s\n"
-"Eble vi ĝisdatigu vian urpmi-datenbazon"
+"--sintezo ne uzeblas kun --media, --excludemedia, --sortmedia, --update aŭ --"
+"parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uzado: urpmi.removemedia [-a] <nomo> ...\n"
-"kie <nomo> estas la nomo de la forigota datenportilo.\n"
+msgid "examining synthesis file [%s]"
+msgstr "mi kontrolas la sintezo-dosieron [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"La instalado ne daŭrigeblas ĉar la sekvaj pakaĵoj\n"
-"forigotas por ke aliaj estu ĝisdatigotaj:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "kontrolanta hdlist-dosieron [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' mankas por reta datenportilo\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuala datenportilo \"%s\" ne estas loka, datenportilo ignorata"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "nekonata pakaĵo"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problemo legante la hdlist aŭ sintezo-dosiero de datenportilo \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalado eblas"
+msgid "performing second pass to compute dependencies\n"
+msgstr "mi faras duan pason por kalkuli dependaĵojn\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"La sekvaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "transsaltu pakaĵon %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "instalus anstataŭ ĝisdatigi pakaĵon %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne povis konsideri medion \"%s\" ĉar ne ekzistas listdosieron [%s]"
+msgid "unable to open rpmdb"
+msgstr "ne povis malfermi rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
+msgid "medium \"%s\" already exists"
+msgstr "medio \"%s\" jam ekzistas"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "mi ne povas aldoni ĝisdatigojn de \"cooker\"-eldono\n"
+msgid "virtual medium need to be local"
+msgstr "virtuala datenportilo devas esti loka"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - babilema modo.\n"
+msgid "added medium %s"
+msgstr "aldonita datenportilo %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Mi pravalorizas..."
+msgid "unable to access first installation medium"
+msgstr "ne povis aliri la unuan instal-datenportilon"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
+msgid "copying hdlists file..."
+msgstr "kopianta la hdlists-dosieron..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - printu ĉiujn etikedojn.\n"
+msgid "...copying failed"
+msgstr "...kopiado malsukcesis"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
+msgid "...copying done"
+msgstr "...kopiado farita"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuala datenportilo \"%s\" ne havu difinitan hdlist aŭ list-dosieron, "
-"datenportilo ignorata"
+"neeblas aliri la unuan instal-datenportilon (ne troviĝis dosieroMandrake/"
+"base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "mi kalkulas md5sum de kopiita font-hdlist (aŭ sintezo)"
+msgid "retrieving hdlists file..."
+msgstr "mi ekstraktas la dosieron hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eksigu padon disigitan de komo.\n"
+msgid "...retrieving done"
+msgstr "... ekstraktado farita"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Premu la enigklavon kiam vi pretas..."
+msgid "...retrieving failed: %s"
+msgstr "...ekstraktado malsukcesis: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nekonataj opcioj '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nevalida hd-list-priskribo \"%s\" en hd-list-dosiero"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - splitu en etaj transakcioj se pli ol donitaj pakaĵoj\n"
-"                   estas instalotaj aŭ ĝisdatigotaj,\n"
-"                   defaŭlta estas %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "provas elekti neekzistantan datenportilon \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problemo legante la hdlist aŭ sintezo-dosiero de datenportilo \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "mi elektas plurtipan datenportilon: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - uzu wget por ekstrakti forajn dosierojn.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "foriganta datenportilon \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - permesu serĉadon en \"disponigas\" por trovi la pakaĵon.\n"
+"ne povas aliri datenportilon \"%s\",\n"
+"tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes   - listigas haveblajn nodojn kiam vi uzas --parallel.\n"
+"virtuala datenportilo \"%s\" havu validan fonto-hdlist aŭ sintezon, "
+"datenportilo ignorata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "konstruas \"hdlist\" [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "mi kopias priskrib-dosieron de \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - konservu ekzistantajn pakaĵojn laŭeble, rifuzu "
-"postulatajn\n"
-"                   pakaĵojn kiuj kondukas al forigo.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "mi kalkulas md5sum de ekzistanta hd-listo (aŭ sintezo)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "mi kontrolas dosieron MD5SUM"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ordono ne trovata\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "mi kopias fontan hd-liston (aŭ sintezon) de \"%s\""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to register rpm file"
-msgstr "ne povas registri rpm-dosieron"
+#: ../urpm.pm:1105
+#, fuzzy, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "wget de [%s] malsukcesis (eble wget mankas?)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permesu peti la uzulon instali pakaĵojn sen\n"
-"                   kontrolado de dependaĵoj.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "mi kalkulas md5sum de kopiita font-hdlist (aŭ sintezo)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne povas uzi la protokolon: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiado de [%s] malsukcesis(md5sum-konfuzo)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "mi ekstraktas la dosieron hdlists..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "mi legas la rpm-dosierojn de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "aldonita datenportilo %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne povis legi rpm-dosierojn de [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
+msgid "no rpm files found from [%s]"
+msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"transakcio kreita por instali sur %s (forigu=%d, instalu=%d, ĝisdatigu=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum-konfuzo"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintakseraro en konfigura dosiero ĉe linio %s"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nomoj aŭ rpm-dosieroj tapitaj en la komanda linio instaliĝos.\n"
+msgid "md5sum mismatch"
+msgstr "md5sum-konfuzo"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - uzu indikitan  HTTP-prokuron, la pordonumero estas "
-"supozeble\n"
-"                   1080 defaŭlte (la formato estas <prokura gastiganto[:"
-"pordo]>).\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "Ekstrakto de fonta hdlist (aŭ sintezo) malsukcesis"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "in order to install %s"
-msgstr "por instali %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "translokigis %s enskribaĵojn en \"depslist\""
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "dosiero [%s] jam uzata en la sama datenportilo \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne povis analizi hdlist dosieron de \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
+msgid "unable to write list file of \"%s\""
+msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "instalus anstataŭ ĝisdatigi pakaĵon %s"
+msgid "writing list file for medium \"%s\""
+msgstr "skribante list-dosieron por datenportilo \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "mi ekstraktas spegulojn ĉe %s ..."
+msgid "nothing written in list file for \"%s\""
+msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - presu url-on de etikedo: url.\n"
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "skribis nenion en listdosiero por \"%s\""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nekonata protokolo difinita por %s"
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpmq:1
-#, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - presu version kaj ankaŭ eldonon kun nomo.\n"
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ne povis skribi listdosieron de \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
+msgid "reading headers from medium \"%s\""
+msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medio \"%s\" jam ekzistas"
+msgid "building hdlist [%s]"
+msgstr "konstruas \"hdlist\" [%s]"
 
-#: ../_irpm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "installing %s\n"
-msgstr "instalas %s\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"la enskribaĵo por ĝisgatigi mankas\n"
-"(unu el %s)\n"
+msgid "found %d headers in cache"
+msgstr "trovis %d ĉapdosierojn en kaŝejo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "trying to promote %s"
-msgstr "mi provas disponigi %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "forigas %d jam ne uzatajn ĉapdosierojn en kaŝejo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ne povas forigi pakaĵon %s"
+msgid "mounting %s"
+msgstr "muntas %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
+msgid "unmounting %s"
+msgstr "malmuntas %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"la enskribaĵo por forpreni mankas\n"
-"(unu el %s)\n"
+msgid "relocated %s entries in depslist"
+msgstr "translokigis %s enskribaĵojn en \"depslist\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - elektu ĉiujn datenportilojn.\n"
+msgid "no entries relocated in depslist"
+msgstr "neniaj rikordoj lokitaj en depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Mankas signaturo (%s)"
+msgid "invalid rpm file name [%s]"
+msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne povis legi rpm-dosierojn de [%s]: %s"
+msgid "retrieving rpm file [%s] ..."
+msgstr "mi ekstraktas rpm-dosieron [%s] ..."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "wget de [%s] malsukcesis (eble wget mankas?)"
+msgid "unable to access rpm file [%s]"
+msgstr "ne povis atingi rpm-an dosieron [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
+msgid "unable to register rpm file"
+msgstr "ne povas registri rpm-dosieron"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - printu etikedo-grupon: group.\n"
+msgid "error registering local packages"
+msgstr "eraro dum registri lokajn pakaĵojn"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"datenportilo \"%s\" provis uzi jam uzitan liston, ignoras datenportilon"
+msgid "no package named %s"
+msgstr "neniu pakaĵo nomata %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "malbone formata enigo: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "forigi pakaĵon %s detruos vian sistemon"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr ""
+"ekzistas plurajn pakaĵojn kiuj havas la saman rpm-an dosiernomon \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Iuj postulataj pakaĵoj ne instaleblas:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
+"datenportilo \"%s\" uzas nevalidan list-dosieron:\n"
+"  spegulo estas eble ne ĝisdata, provu uzi alternativan metodon"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "neniaj rikordoj lokitaj en depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "la datenportilo \"%s\" ne difinas ian lokon por rpm-dosieroj"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalu nur font-pakaĵojn (ne binarajn).\n"
+msgid "package %s is not found."
+msgstr "pakaĵo %s ne estis trovata."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-datenbazo ŝlosita"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medio \"%s\" ne estas elektata"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "ĉu vi konsentas ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekohera listdosiero por \"%s\", medio ignorita"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "... ekstraktado farita"
+msgid "unable to access medium \"%s\""
+msgstr "ne povis atingi medion \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "mi aldonas pakaĵon %s (id=%d, eid=%d, ĝisdatigo=%d, dosiero=%s)"
+msgid "malformed input: [%s]"
+msgstr "malbone formata enigo: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "transsaltu pakaĵon %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Nevalida signaturo (%s)"
+msgid "Preparing..."
+msgstr "Mi preparas..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
-"  nomoj aŭ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi-versio %s\n"
-"Kopirajto (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
-"GPL.\n"
-"\n"
-"uzado:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne povis ĝuste analizi [%s] je valoro \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne povis determini medion de ĉi tiu \"hdlist\" dosiero [%s]"
+"transakcio kreita por instali sur %s (forigu=%d, instalu=%d, ĝisdatigu=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne povis analizi hdlist dosieron de \"%s\""
+msgid "unable to create transaction"
+msgstr "ne povis krei transakcion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"datenportilo \"%s\" provas uzi jam uzitan hdlist, datenportilo ignorata"
+msgid "removing package %s"
+msgstr "mi forigas la pakaĵon %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "pro konflikto kun %s"
+msgid "unable to remove package %s"
+msgstr "ne povas forigi pakaĵon %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "forigas %d jam ne uzatajn ĉapdosierojn en kaŝejo"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "mi aldonas pakaĵon %s (id=%d, eid=%d, ĝisdatigo=%d, dosiero=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne povis ĝisdatigi medion \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "ne povas instali pakaĵon %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
+msgid "due to missing %s"
+msgstr "pro mankanta %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuala datenportilo \"%s\" ne estas loka, datenportilo ignorata"
+msgid "due to unsatisfied %s"
+msgstr "pro neplenumita %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Mi preparas..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
+msgid "trying to promote %s"
+msgstr "mi provas disponigi %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
+msgid "in order to keep %s"
+msgstr "por konservi %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ne provu trovi ian sintezon aŭ\n"
-"                   hdlist-dosieron.\n"
+msgid "in order to install %s"
+msgstr "por instali %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne serĉu en provides por trovi pakaĵon.\n"
+msgid "due to conflicts with %s"
+msgstr "pro konflikto kun %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiado de [%s] malsukcesis(md5sum-konfuzo)"
+msgid "unrequested"
+msgstr "nepetita"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Nevalida signaturo (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Nevalida Ŝlosil-ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - forigu rpm el la kaŝejo antaŭ ol fari ion ajn alian.\n"
+msgid "Missing signature (%s)"
+msgstr "Mankas signaturo (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "ne povis uzi nomon \"%s\" por sennoma medio ĉar ĝi jam estas uzata"
+msgid "bad proxy declaration on command line\n"
+msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuala datenportilo \"%s\" havu validan fonto-hdlist aŭ sintezon, "
-"datenportilo ignorata"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Bedaŭrinde, nevalida elekto, reprovu\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -913,647 +819,694 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"uzado: urpmi.addmedia [--update] <nomo> <url>\n"
-"kie <url> estas unu el\n"
-"       file://<pado>\n"
-"       ftp://<salutnomo>:<pasvorto>@<servilo>/<pado> kun <relativa "
-"dosieronomo de hd-listo>\n"
-"       ftp://<servilo>/<pado> kun <relativa dosieronomo de hd-listo>\n"
-"       http://<servilo>/<pado> kun <relativa dosieronomo de hd-listo>\n"
-"       removable://<pado>\n"
-"\n"
-"kaj [opcioj] estas de\n"
+"  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "mi kopias fontan hd-liston (aŭ sintezon) de \"%s\""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiado farita"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne povis uzi paralelan opcion \"%s\""
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"datenportilo \"%s\" uzas nevalidan list-dosieron:\n"
-"  spegulo estas eble ne ĝisdata, provu uzi alternativan metodon"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ne povis aliri la unuan instal-datenportilon"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - babilema modo.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuala datenportilo devas esti loka"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "eraro dum registri lokajn pakaĵojn"
+msgid "unknown packages"
+msgstr "nekonataj pakaĵoj"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limigu la deŝut-rapidon.\n"
+msgid "unknown package"
+msgstr "nekonata pakaĵo"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
+msgid "removing package %s will break your system"
+msgstr "forigi pakaĵon %s detruos vian sistemon"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "Ekstrakto de fonta hdlist (aŭ sintezo) malsukcesis"
+msgid "Nothing to remove"
+msgstr "Nenio forigenda"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Mi kontrolas por forigi la sekvajn pakaĵojn"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "skribis nenion en listdosiero por \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas forigotaj (%d mb)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "mi kalkulas md5sum de ekzistanta hd-listo (aŭ sintezo)"
+msgid "removing %s"
+msgstr "foriganta %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kompleta eligo kun forigota pakaĵo.\n"
+msgid "Removing failed"
+msgstr "Forigado malsukcesis"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf-versio %s\n"
+"Kopirajto (C) 2002 MandrakeSoft.\n"
+"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
+"GPL.\n"
+"\n"
+"uzado:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "ne povas instali pakaĵon %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ne uzu la donitan datenportilon, disigitan per komo.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - permesu peti uzulon instali pakaĵojn sen\n"
-"                   dependaĵ-kontrolo kaj integreco.\n"
+"  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
+"komo.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - babilema modo.\n"
+
+#: ../urpmf:39
+#, c-format
+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 donita "
+"en la komanda\n"
+"                   linio, malkongrua kun interaga modo).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ne printu identajn liniojn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne povas skribi konfigurodosieron [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - printu ĉiujn etikedojn.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - printu etikedo-grupon: group.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Nevalida Ŝlosil-ID (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - printu grandecon de etikedo: size.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --group         - printu etikedan resumon: summary.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - printu etiked-pakilon: packager.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativa dosieronomo de hd-listo> mankas\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Mi kontrolas por forigi la sekvajn pakaĵojn"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "nepetita"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne povis atingi rpm-an dosieron [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - printu etikedajn dosierojn: ĉiujn dosierojn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ne povis analizi \"%s\" en dosiero [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne povis legi rpm-an dosieron [%s] de medio \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - uzu specifan medion (tipe estas cim-\n"
+"                   raporto).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - presu uzeblan informon en homlega formo.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - printu version, eldonon kaj arkivon kun nomo.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - uzu la indikitan eldon-version, la defaŭlta estas "
-"prenita\n"
-"                   de la versio de la eldono indikita de la\n"
-"                   instalita mandrak-eldon-pakaĵo.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - uzu la indikitan url por la listo de speguloj, la "
-"defaŭlta estas\n"
-"                   %s\n"
+"  -a             - binara KAJ-operatoro, vera se ambaŭ esprimoj estas "
+"veraj.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - binara AŬ-operatoro, vera se unu esprimo estas vera.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unuloka NE, vera se esprimo estas malĝusta.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "malmuntas %s"
-
-#: ../urpmi.update:1
+#: ../urpmf:65
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - maldekstra parentezo por malfermi grup-esprimon.\n"
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% finita, rapido = %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
+"callback estas :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "mi kontrolas la sintezo-dosieron [%s]"
+msgid "using specific environment on %s\n"
+msgstr "uzante specifan medion sur %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiado malsukcesis"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi-versio %s\n"
+"Kopirajto (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
+"GPL.\n"
+"\n"
+"uzado:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - silenta modo.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
 
-#: ../urpmf:1
+#: ../urpmi:85
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - babilema modo.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - donu ĉiujn font-pakaĵojn antaŭ ol deŝuti (nur root).\n"
+"  --keep         - konservu ekzistantajn pakaĵojn laŭeble, rifuzu "
+"postulatajn\n"
+"                   pakaĵojn kiuj kondukas al forigo.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - ekstraktu ĉapojn por la pakaĵo listigita de urpmi db al\n"
-"                   stdout (nur root).\n"
+"  --split-level  - splitu en etaj transakcioj se pli ol donitaj pakaĵoj\n"
+"                   estas instalotaj aŭ ĝisdatigotaj,\n"
+"                   defaŭlta estas %d.\n"
 
-#: ../urpme:1
+#: ../urpmi:91
 #, c-format
-msgid "unknown packages"
-msgstr "nekonataj pakaĵoj"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - eta transakcio-longo, defaŭlta estas %d.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "mi elektas plurtipan datenportilon: %s"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - printu version, eldonon kaj arkivon kun nomo.\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "dosiero [%s] jam uzata en la sama datenportilo \"%s\""
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalu nur font-pakaĵojn (ne binarajn).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:95
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - forigu rpm el la kaŝejo antaŭ ol fari ion ajn alian.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:98
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - presu tiun ĉi help-mesaĝon.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permesu peti la uzulon instali pakaĵojn sen\n"
+"                   kontrolado de dependaĵoj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "trovis paralelan traktilon por nodoj: %s"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - permesu peti uzulon instali pakaĵojn sen\n"
+"                   dependaĵ-kontrolo kaj integreco.\n"
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"callback estas :\n"
-"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uzu wget por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, 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-versio %s\n"
-"Kopirajto (C) 2002 MandrakeSoft.\n"
-"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
-"GPL.\n"
-"\n"
-"uzado:\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limigu la deŝut-rapidon.\n"
+
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --quiet         - ne printu etikedonomon (defaŭlto se neniu etikedo donita "
-"en la komanda\n"
-"                   linio, malkongrua kun interaga modo).\n"
+"  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
+"                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../urpmf:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ne printu identajn liniojn.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - uzu indikitan  HTTP-prokuron, la pordonumero estas "
+"supozeble\n"
+"                   1080 defaŭlte (la formato estas <prokura gastiganto[:"
+"pordo]>).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"--sintezo ne uzeblas kun --media, --excludemedia, --sortmedia, --update aŭ --"
-"parallel"
+"  --proxy-user   - difinu uzulon kaj pasvorton por uzi prokuran\n"
+"                   aŭtentigon (formato estas <uzulo:pasvorto>).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --arch         - uzu indikitan arkitekturon, la defaŭlta estas arch de\n"
-"                   la instalita mandrak-eldon-pakaĵo.\n"
+"  --bug          - eligu cim-raporton en dosierujon indikitan de\n"
+"                   next arg.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:119
 #, c-format
-msgid "Is this OK?"
-msgstr "Ĉu tio estas bona?"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - uzu X-interfacon.\n"
 
-#: ../urpmi:1
+#: ../urpmi:120
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - elektu la plej bonan interfacon laŭ la medio:\n"
+"                   X- aŭ tekst-modo.\n"
 
-#: ../urpmf:1 ../urpmq:1
-#, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "mi kontrolas la paralelan traktilon en dosiero [%s]"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
+"                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../urpme:1
+#: ../urpmi:125
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nenio forigenda"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "ne povis skribi listdosieron de \"%s\""
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eksigu padon disigitan de komo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - etendu la informmendon al pakaĵ-dependaĵoj.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - elektu ĉiujn kongruojn en la komanda linio.\n"
 
-#: ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --bug          - eligu cim-raporton en dosierujon indikitan de\n"
-"                   next arg.\n"
+"  -p             - permesu serĉadon en \"disponigas\" por trovi la pakaĵon.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "la datenportilo \"%s\" ne difinas ian lokon por rpm-dosieroj"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne serĉu en provides por trovi pakaĵon.\n"
 
-#: ../urpmf:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne povis skribi listdosieron de \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
 
-#: ../urpmf:1
+#: ../urpmi:132
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - silenta modo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "provas elekti neekzistantan datenportilon \"%s\""
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nomoj aŭ rpm-dosieroj tapitaj en la komanda linio instaliĝos.\n"
 
-#: ../urpmf:1
+#: ../urpmi:141
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - printu etikedan priskribon: description.\n"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:197
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiado malsukcesis"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Kio fareblas per binaraj rpm-dosieroj se uzante --install-src"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:204
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - trudu generadon de hdlist-dosieroj.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:212
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes uzeblas nur kun --parallel"
+msgid "Do nothing"
+msgstr "Faru nenion"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Save file"
 msgstr ""
-"  -s             - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "installing %s"
-msgstr "instalas %s"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Instalado malsukcesis"
 
-#: ../urpm.pm:1
+#: ../urpmi:239
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "mi legas la rpm-dosierojn de [%s]"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "mi kopias priskrib-dosieron de \"%s\"..."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Ne povas krei dosierujon [%s] por cim-raporto"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
+msgid "Copying failed"
+msgstr "Kopiado malsukcesis"
 
-#: ../urpme:1
+#: ../urpmi:260
 #, c-format
-msgid "Removing failed"
-msgstr "Forigado malsukcesis"
+msgid "Only superuser is allowed to install packages"
+msgstr "Nur superuzulo rajtas instali pakaĵojn"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:396
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
-"  --virtual      - kreu virtualan datenportikojn ĉiam ĝisdatajn,\n"
-"                   nur dosiero:// protokolo estas permesita.\n"
+msgid "One of the following packages is needed:"
+msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "package %s is not found."
-msgstr "pakaĵo %s ne estis trovata."
+msgid "What is your choice? (1-%d) "
+msgstr "Kiu estas via elekto? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "foriganta datenportilon \"%s\""
+msgid "Package installation..."
+msgstr "Instalado de pakaĵo..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
+msgid "Initializing..."
+msgstr "Mi pravalorizas..."
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "Cancel"
-msgstr "Nuligu"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Iuj postulataj pakaĵoj ne instaleblas:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - venonta pakaĵo estas font-pakaĵo (same kiel -s).\n"
+msgid "do you agree ?"
+msgstr "ĉu vi konsentas ?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --env          - uzu specifan medion (tipe estas cim-\n"
-"                   raporto).\n"
+"La instalado ne daŭrigeblas ĉar la sekvaj pakaĵoj\n"
+"forigotas por ke aliaj estu ĝisdatigotaj:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
-"komo.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne povis atingi medion \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne povis krei medion \"%s\"\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - printu etiked-pakilon: packager.\n"
+"La sekvaj pakaĵoj estas forigotaj por ke aliaj estu ĝisdatigotaj:\n"
+"%s"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Por plenumi dependaĵojn, la sekvantaj pakaĵoj estas instalonta (%d mb)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1562,370 +1515,425 @@ msgstr ""
 "Vi devas esti root por instali la sekvajn dependaĵojn:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - printu ĉiujn etikedojn.\n"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "Ne povas preni fontajn pakaĵojn.  Mi ĉesiĝas."
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparato [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
+msgid "Press Enter when ready..."
+msgstr "Premu la enigklavon kiam vi pretas..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "Mi deŝutas pakaĵon '%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "kontrolanta hdlist-dosieron [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s finita, ETA = %s, rapido = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopianta la hdlists-dosieron..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% finita, rapido = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skribante list-dosieron por datenportilo \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "La sekvantaj pakaĵoj havas malĝustajn signaturojn"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuala datenportilo \"%s\" havu klaran url, datenportilo ignorata"
+msgid "Do you want to continue installation ?"
+msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalado malsukcesis, kelkaj dosieroj mankas:\n"
+"%s\n"
+"Eble vi ĝisdatigu vian urpmi-datenbazon"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Faru nenion"
+msgid "Installation failed"
+msgstr "Instalado malsukcesis"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "uzanta asociitaj datenportiloj por paralela modo: %s"
+msgid "distributing %s"
+msgstr "distribuanta %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "muntas %s"
+msgid "installing %s"
+msgstr "instalas %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "ne povis trakti pri medion \"%s\" ĉar alia medio jam uzas listdosieron"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Ne povas preni fontajn pakaĵojn.  Mi ĉesiĝas."
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s finita, ETA = %s, rapido = %s"
+msgid "%d installation transactions failed"
+msgstr "La instal-transakcio %d malsukcesis"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
+msgid "Installation is possible"
+msgstr "Instalado eblas"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ne povis skribi listdosieron de \"%s\""
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "ĉio jam instalita"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+msgid "restarting urpmi"
 msgstr ""
-"  --no-uninstall - neniam petu malinstali pakaĵon, ĉesigu la instaladon.\n"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq-versio %s\n"
-"Kopirajto (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
-"GPL.\n"
+"uzado: urpmi.addmedia [--update] <nomo> <url>\n"
+"kie <url> estas unu el\n"
+"       file://<pado>\n"
+"       ftp://<salutnomo>:<pasvorto>@<servilo>/<pado> kun <relativa "
+"dosieronomo de hd-listo>\n"
+"       ftp://<servilo>/<pado> kun <relativa dosieronomo de hd-listo>\n"
+"       http://<servilo>/<pado> kun <relativa dosieronomo de hd-listo>\n"
+"       removable://<pado>\n"
 "\n"
-"uzado:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
+"kaj [opcioj] estas de\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medio \"%s\" ne estas elektata"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Nur superuzulo rajtas instali pakaĵojn"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uzante specifan medion sur %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ne provu trovi ian sintezon aŭ\n"
+"                   hdlist-dosieron.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne povis trovi \"hdlist\"-an dosieron por \"%s\", ignoris medion"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - kreas aŭtomate ĉiujn datenportilojn de instala\n"
+"                   datenportilo.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - eta transakcio-longo, defaŭlta estas %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - aŭtomate kreas datenportilon por XXX parto de\n"
+"                   eldono, XXX povas esti ĉefa (main), kontribuaĵo "
+"(contrib), ĝisdatigoj (updates) aŭ\n"
+"                   io ajn alia kio estis konfigurita ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - maldekstra parentezo por malfermi grup-esprimon.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - uzu la indikitan url por la listo de speguloj, la "
+"defaŭlta estas\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - uzu la indikitan eldon-version, la defaŭlta estas "
+"prenita\n"
+"                   de la versio de la eldono indikita de la\n"
+"                   instalita mandrak-eldon-pakaĵo.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - binara KAJ-operatoro, vera se ambaŭ esprimoj estas "
-"veraj.\n"
+"  --arch         - uzu indikitan arkitekturon, la defaŭlta estas arch de\n"
+"                   la instalita mandrak-eldon-pakaĵo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"ne povas aliri datenportilon \"%s\",\n"
-"tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
+"  --virtual      - kreu virtualan datenportikojn ĉiam ĝisdatajn,\n"
+"                   nur dosiero:// protokolo estas permesita.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - printu etikedo-grupon: group.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - purigu la dosieron de kap-kaŝejo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "ne povis krei transakcion"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - trudu generadon de hdlist-dosieroj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ekstraktanta la rpm-dosierojn de datenportilo \"%s\"..."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "mi ne povas aldoni ĝisdatigojn de \"cooker\"-eldono\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+msgid "retrieving mirrors at %s ..."
+msgstr "mi ekstraktas spegulojn ĉe %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "distribuanta %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne povis ĝisdatigi medion \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "skribu konfiguran dosieron [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - elektu ĉiujn nemoveblajn datenportilojn.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' mankas por reta datenportilo\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne povis krei medion \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
-"                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
+"uzado: urpmi.removemedia [-a] <nomo> ...\n"
+"kie <nomo> estas la nomo de la forigota datenportilo.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparato [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - elektu ĉiujn datenportilojn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nekonataj opcioj '%s'\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por forpreni (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Ok"
-msgstr "Jes"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"la enskribaĵo por forpreni mankas\n"
+"(unu el %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nevalida hd-list-priskribo \"%s\" en hd-list-dosiero"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uzado: urpmi.update [opcioj] <nomo> ...\n"
+"kie <nomo> estas nomo de ĝisdatigota datenportilo.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "removing %s"
-msgstr "foriganta %s"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:40
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
-"  --distrib-XXX  - aŭtomate kreas datenportilon por XXX parto de\n"
-"                   eldono, XXX povas esti ĉefa (main), kontribuaĵo "
-"(contrib), ĝisdatigoj (updates) aŭ\n"
-"                   io ajn alia kio estis konfigurita ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - printu grandecon de etikedo: size.\n"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - elektu ĉiujn nemoveblajn datenportilojn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "in order to keep %s"
-msgstr "por konservi %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:75
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "pro neplenumita %s"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"la enskribaĵo por ĝisgatigi mankas\n"
+"(unu el %s)\n"
 
-#: ../_irpm:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"Aŭtomata instalado de pakaĵoj...\n"
-"Vi mendis instaladon de pakaĵo %s\n"
+"urpmf-versio %s\n"
+"Kopirajto (C) 2002 MandrakeSoft.\n"
+"Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
+"GPL.\n"
+"\n"
+"uzado:\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-datenbazo ŝlosita"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
+
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
-#: ../urpmi:1
+#: ../urpmq:55
 #, fuzzy, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
+
+#: ../urpmq:56
+#, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
-"                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "skribis nenion en listdosiero por \"%s\""
+#: ../urpmq:57
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - listigas haveblajn nodojn kiam vi uzas --parallel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:58
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - listigu haveblajn paralelajn kromnomojn.\n"
+
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - ekstraktu ĉapojn por la pakaĵo listigita de urpmi db al\n"
+"                   stdout (nur root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "prenante moveblan aparaton kiel \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - donu ĉiujn font-pakaĵojn antaŭ ol deŝuti (nur root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - printu ĉiujn etikedojn.\n"
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - trudu serĉadon de dubindaĵoj (same kiel -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - etendu la informmendon al pakaĵ-dependaĵoj.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1933,41 +1941,79 @@ msgid ""
 msgstr ""
 "  -u             - forigu pakaĵon se pli freŝa versio estas jaminstalita.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kompleta eligo kun forigota pakaĵo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "pro mankanta %s"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - presu uzeblan informon en homlega formo.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - printu grupojn ankaŭ kun nomo.\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - presu version kaj ankaŭ eldonon kun nomo.\n"
+
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - listigu haveblajn pakaĵojn.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"uzado: urpmi.update [opcioj] <nomo> ...\n"
-"kie <nomo> estas nomo de ĝisdatigota datenportilo.\n"
+"  nomoj aŭ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes uzeblas nur kun --parallel"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "ne troviĝis plena datenportil-listo"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Unu el la sekvantaj pakaĵoj estas bezonata por instali %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq-versio %s\n"
+#~ "Kopirajto (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Tiu ĉi estas libera programo kaj redistribuebla sub la normoj de la GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "uzado:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Nekonata webfetch (teksprenilo) '%s' !!!\n"
@@ -2143,9 +2189,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "provu `urpmf --help' por pli da opcioj"
 
-#~ msgid "no full media list was found"
-#~ msgstr "ne troviĝis plena datenportil-listo"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "mi kopias la fonto-liston de \"%s\"..."
 
diff --git a/po/es.po b/po/es.po
index 62add591..bdb9e0d8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-29 10:41-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -40,877 +40,779 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - crear automáticamente todos los soportes desde un\n"
-"                   soporte de instalación.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to open rpmdb"
-msgstr "no se puede abrir rpmdb"
+msgid "installing %s\n"
+msgstr "instalando %s\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - imprime este mensaje de ayuda.\n"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalación automática de paquetes...\n"
+"Pidió la instalación del paquete %s\n"
 
-#: ../urpmi:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
+msgid "Is this OK?"
+msgstr "¿Está todo bien?"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "removing package %s"
-msgstr "quitando paquete %s"
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "\"%s\""
-msgstr "«%s»"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "No se puede usar el modo paralelo con el modo use-distrib"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpmi:1
+#: ../_irpm:63
 #, c-format
-msgid "Everything already installed"
-msgstr "ya está todo instalado"
+msgid "%s: command not found\n"
+msgstr "%s: comando no encontrado\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpia dir. encabezados de cache.\n"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"uso: %s [opciones]\n"
+"donde [opciones] son\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "usando proceso %d para ejecutar la transacción"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - imprime este mensaje de ayuda.\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - imprime etiq. provides: todo que proporciona.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [grupo]     - restringe los resultados al grupo dado.\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Qué elige? (1-%d)"
+msgid "                    defaults is %s.\n"
+msgstr "                    lo predeterminado es %s.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "found %d headers in cache"
-msgstr "se encontraron %d encabezados en el cache"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconocido definido para %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "hay muchos paquetes con el mismo nombre de archivo rpm «%s»"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "no se encontró webfetch, los webfetch soportados son: %s\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:95
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especificar usuario y contraseña para utilizar en la\n"
-"                   autenticación del proxy (formato <usuario:contraseña>).\n"
+msgid "unable to handle protocol: %s"
+msgstr "no se puede manejar el protocolo: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "realizando una segunda pasada para computar las dependencias\n"
+msgid "syntax error in config file at line %s"
+msgstr "error de sintaxis en archivo de configuración, en la línea %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "obteniendo archivo rpm [%s] ..."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "soporte «%s» intenta utilizar un hdlist ya usado, soporte ignorado"
 
-#: ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "soporte «%s» intenta utilizar una lista ya usada, soporte ignorado"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:196
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...falló la recuperación: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"no se puede utilizar el soporte «%s» como archivo de lista que ya utiliza "
+"otro soporte"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
-"no se puede inspeccionar el archivo de lista para «%s», soporte ignorado"
+"no se puede utilizar el nombre «%s» para un soporte sin denominar porque ya "
+"se está utilizando"
 
-#: ../urpmf:1
+#: ../urpm.pm:209
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"  -o             - operador O binario, verdadero si una expresión es "
-"verdadera.\n"
+"no se puede tener en cuenta el soporte «%s», porque no existe archivo de "
+"lista [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Package installation..."
-msgstr "Instalación de paquete..."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nombre de archivo rpm no válido [%s]"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo hdlist de «%s», soporte ignorado"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declaración incorrecta del proxy en la línea de comandos\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no se puede acceder al archivo de la lista de «%s», soporte ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "fallaron %d transacciones de instalación"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "intentando pasar al soporte existente «%s», evitando"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"no se puede acceder al primer soporte de la instalación (no se encontró el "
-"archivo Mandrake/base/hdlists)"
+"el soporte virtual «%s» no debería tener definido hdlist o archivo de lista, "
+"soporte ignorado"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Disculpe, elección incorrecta, reinténtelo\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "soporte virtual «%s» debería tener una URL limpia, soporte ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Choose location to save file"
-msgstr "Elija ubicación para guardar archivo"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no se puede encontrar el archivo hdlist para «%s», soporte ignorado"
 
-#: ../urpmf:1
+#: ../urpm.pm:278
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - imprime etiqueta resumen: summary.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "no se puede encontrar el archivo de lista para «%s», soporte ignorado"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:301
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Los siguientes paquetes contienen %s: %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "archivo de lista no coherente para «%s», soporte ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Install it"
-msgstr "Instalarlo"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"no se puede inspeccionar el archivo de lista para «%s», soporte ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usar la interfaz X.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "demasiados puntos de montaje para medios extraíbles «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Uno de los paquetes siguientes es necesario:"
+msgid "taking removable device as \"%s\""
+msgstr "tomar dispositivo extraíble como «%s»"
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Para satisfacer las dependencias, se quitarán los paquetes siguientes (%d MB)"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - selecciona el mejor interfaz según el entorno:\n"
-"                   modo X o texto.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no se puede recuperar el nombre de ruta para medio extraíble «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Descargando paquete `%s'..."
+msgid "unable to write config file [%s]"
+msgstr "no se puede escribir el archivo de configuración [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-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"
+msgid "write config file [%s]"
+msgstr "escrito archivo de configuración [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - seleccionar automáticamente paquetes para actualizar "
-"sistema.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "No se puede usar el modo paralelo con el modo use-distrib"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
 #, c-format
-msgid "no package named %s"
-msgstr "ningún paquete llamado %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "no se puede analizar \"%s\" en el archivo [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - selecciona todas coincidencias en línea de comando.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "examinando el manejador paralelo en el archivo [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Falló la instalación, faltan algunos archivos:\n"
-"%s\n"
-"Puede querer actualizar su base de datos de urpmi"
+msgid "found parallel handler for nodes: %s"
+msgstr "se encontró manejador paralelo para los nodos: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nombre> ...\n"
-"donde <nombre> es nombre del soporte a borrar.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "usando el soporte asociado para el modo paralelo: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "no se puede utilizar la opción paralelo «%s»"
+
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"La instalación no puede continuar porque se tienen quitar los paquetes\n"
-"siguientes para poder actualizar otros:\n"
-"%s\n"
+"--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
+"update o --parallel"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "falta «with» para soporte de red\n"
+msgid "examining synthesis file [%s]"
+msgstr "examinando el archivo de síntesis [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista los archivos en el paquete.\n"
+msgid "examining hdlist file [%s]"
+msgstr "examinando el archivo hdlist [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "paquete desconocido "
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "soporte virtual «%s» no es local, soporte ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "Es posible la instalación"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problema leyendo hdlist o el archivo de síntesis del soporte «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "realizando una segunda pasada para computar las dependencias\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Para satisfacer las dependencias, se instalarán los %d paquetes siguientes (%"
-"d MB)"
+msgid "skipping package %s"
+msgstr "omitiendo paquete %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"no se puede tener en cuenta el soporte «%s», porque no existe archivo de "
-"lista [%s]"
+msgid "would install instead of upgrade package %s"
+msgstr "instalaría en vez de actualizar el paquete %s"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "unable to open rpmdb"
+msgstr "no se puede abrir rpmdb"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "no se pueden añadir actualizaciones de una distribución cooker\n"
+msgid "medium \"%s\" already exists"
+msgstr "ya existe el soporte «%s»"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo informativo.\n"
+msgid "virtual medium need to be local"
+msgstr "soporte virtual debe ser local"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializando..."
+msgid "added medium %s"
+msgstr "añadido soporte %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista los paquetes disponibles.\n"
+msgid "unable to access first installation medium"
+msgstr "no se puede acceder al primer soporte de la instalación"
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - imprime todas las etiquetas.\n"
+msgid "copying hdlists file..."
+msgstr "copiando archivo hdlists..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
+msgid "...copying failed"
+msgstr "...falló la copia"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...copia hecha"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"el soporte virtual «%s» no debería tener definido hdlist o archivo de lista, "
-"soporte ignorado"
+"no se puede acceder al primer soporte de la instalación (no se encontró el "
+"archivo Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "computando md5sum de hdlist fuente (o síntesis) copiado"
+msgid "retrieving hdlists file..."
+msgstr "recuperando archivo hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath   - ruta de exclusión separada por coma.\n"
+msgid "...retrieving done"
+msgstr "...recuperación hecha"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Presione «Intro» cuando esté listo..."
+msgid "...retrieving failed: %s"
+msgstr "...falló la recuperación: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opciones desconocidas «%s»\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descripción de hdlist no válida «%s» en archivo hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - dividir en transacciones pequeñas si se van a actualizar\n"
-"                   o instalar más paquetes dados,\n"
-"                   %d es el predeterminado.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "intentando seleccionar soporte inexistente \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problema leyendo hdlist o el archivo de síntesis del soporte «%s»"
+msgid "selecting multiple media: %s"
+msgstr "seleccionando soportes múltiples: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
+msgid "\"%s\""
+msgstr "«%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - permite buscar en provides para encontrar paquete.\n"
+msgid "removing medium \"%s\""
+msgstr "quitando el soporte «%s»"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "generando hdlist [%s]"
+"no se puede acceder soporte \"%s\",\n"
+"esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - mantener paquetes existentes si es posible, descartar "
-"pedidos\n"
-"                   de paquetes que lleven a quitarlos.\n"
+"soporte virtual «%s» debería tener un hdlist fuente o síntesis válido, "
+"soporte ignorado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "examinando el archivo MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copiando descripción de archivo de «%s»..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comando no encontrado\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "computando md5sum de hdlist fuente (o síntesis) existente"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "no se puede registrar el archivo rpm"
+msgid "examining MD5SUM file"
+msgstr "examinando el archivo MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
-"                   sin verificar las dependencias.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copiando hdlist fuente (o síntesis) de «%s»..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "no se puede manejar el protocolo: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "recuperando archivo hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "computando md5sum de hdlist fuente (o síntesis) copiado"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Sí, deseo instalarlo"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "falló la copia de [%s] (no coincide md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "añadido soporte %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mantener rpm no usado en cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "leyendo archivos rpm de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
-"actualizar=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "no se pueden leer los archivos rpm de [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "no concuerda md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "no se encontraron archivos rpm en [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "error de sintaxis en archivo de configuración, en la línea %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recuperando hdlist fuente (o síntesis) de «%s»..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "encontrado hdlist por prueba (o síntesis) como «%s»"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - usar proxy HTTP especificado, se asume que el puerto es\n"
-"                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "computando md5sum del hdlist fuente (o síntesis) recuperado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "md5sum mismatch"
+msgstr "no concuerda md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relocalizadas %s entradas en la lista de dependencias"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "falló la recuperación de hdlist fuente (o síntesis)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignora distinción entre mayús. y minús. en todos los "
-"patrones.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "No se puede crear el directorio [%s] para reporte de bugs"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "archivo [%s] ya utilizado en el mismo soporte «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "instalaría en vez de actualizar el paquete %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "no se puede interpretar el archivo hdlist de «%s»"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "obteniendo sitios de réplica en %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "no se puede escribir el archivo de lista de «%s»"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - imprime etiq. url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "escribiendo archivo de lista para el soporte «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconocido definido para %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "nada escrito en el archivo de lista para «%s»"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - imprimir versión y revisión junto con el nombre.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "examinando archivo de clave pública de «%s»..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "ya existe el soporte «%s»"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "no se puede importar archivo de clave pública de «%s»"
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "leyendo encabezados del soporte «%s»"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta la entrada a actualizar\n"
-"(una de %s)\n"
+msgid "building hdlist [%s]"
+msgstr "generando hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "intentando promover %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "no se puede quitar el paquete %s"
+msgid "found %d headers in cache"
+msgstr "se encontraron %d encabezados en el cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
+msgid "removing %d obsolete headers in cache"
+msgstr "quitando %d encabezados obsoletos del cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"falta la entrada a quitar\n"
-"(una de %s)\n"
+msgid "mounting %s"
+msgstr "montando %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona todos los soportes.\n"
+msgid "unmounting %s"
+msgstr "desmontando %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta firma (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "relocalizadas %s entradas en la lista de dependencias"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "no se pueden leer los archivos rpm de [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "no hay entradas reubicadas en depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "nombre de archivo rpm no válido [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "obteniendo archivo rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - actualizar sólo el soporte de actualización.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "no se puede acceder al archivo rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+msgid "unable to register rpm file"
+msgstr "no se puede registrar el archivo rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [grupo]     - restringe los resultados al grupo dado.\n"
+msgid "error registering local packages"
+msgstr "error registrando paquetes locales"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "soporte «%s» intenta utilizar una lista ya usada, soporte ignorado"
+msgid "no package named %s"
+msgstr "ningún paquete llamado %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada mal formada [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Los siguientes paquetes contienen %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "quitar el paquete %s dañará su sistema"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hay muchos paquetes con el mismo nombre de archivo rpm «%s»"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista los soportes disponibles.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "no se puede analizar correctamente [%s] sobre el valor «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"No se puede instalar algún paquete pedido:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando paquete `%s' (%s/%s)..."
+"soporte \"%s\" usa un archivo de lista no válido:\n"
+"  probablemente el sitio de réplica no está actualizado, intentando método "
+"alternativo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "no hay entradas reubicadas en depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "el soporte «%s» no define ubicación alguna para archivos rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalar sólo paquete de fuentes (ningún binario)\n"
+msgid "package %s is not found."
+msgstr "no se encontró el paquete %s."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
+msgid "urpmi database locked"
+msgstr "base de datos de urpmi bloqueada"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "el soporte «%s» no está seleccionado"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "¿está de acuerdo?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no se puede leer el archivo rpm [%s] del soporte «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "archivo de lista no coherente para «%s», soporte ignorado"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...recuperación hecha"
+msgid "unable to access medium \"%s\""
+msgstr "no se puede acceder al soporte «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "añadiendo paquete %s (id=%d, eid=%d, actualización=%d, archivo=%s)"
+msgid "malformed input: [%s]"
+msgstr "entrada mal formada [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "omitiendo paquete %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "obteniendo archivos rpm desde el soporte  «%s» ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma no válida (%s)"
+msgid "Preparing..."
+msgstr "Preparando..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  los nombres o archivos rpm dados en línea de comandos se consultan.\n"
+msgid "using process %d for executing transaction"
+msgstr "usando proceso %d para ejecutar la transacción"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urmpi versión %s\n"
-"Copyright (C) 1999, 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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "no se puede analizar correctamente [%s] sobre el valor «%s»"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "no se puede determinar el soporte de este archivo hdlist [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "no se puede interpretar el archivo hdlist de «%s»"
+"transacción creada para instalar sobre %s (quitar=%d, instalar=%d, "
+"actualizar=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "soporte «%s» intenta utilizar un hdlist ya usado, soporte ignorado"
+msgid "unable to create transaction"
+msgstr "no se puede crear transacción"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "debido a conflictos con %s"
+msgid "removing package %s"
+msgstr "quitando paquete %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "quitando %d encabezados obsoletos del cache"
+msgid "unable to remove package %s"
+msgstr "no se puede quitar el paquete %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "no se puede actualizar soporte «%s»\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "añadiendo paquete %s (id=%d, eid=%d, actualización=%d, archivo=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
+msgid "unable to install package %s"
+msgstr "no se puede instalar el paquete %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "soporte virtual «%s» no es local, soporte ignorado"
+msgid "due to missing %s"
+msgstr "debido a que falta %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Preparando..."
+msgid "due to unsatisfied %s"
+msgstr "debido a que no se satisfizo %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    lo predeterminado es %s.\n"
+msgid "trying to promote %s"
+msgstr "intentando promover %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
+msgid "in order to keep %s"
+msgstr "para mantener %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - no intentar encontrar archivos synthesis o hdlist.\n"
+msgid "in order to install %s"
+msgstr "para instalar %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p             - no buscar en «provides» para encontrar paquete.\n"
+msgid "due to conflicts with %s"
+msgstr "debido a conflictos con %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "falló la copia de [%s] (no coincide md5sum)"
+msgid "unrequested"
+msgstr "no pedido"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
-"distribución.\n"
-"                   Esto permite consultar una distro.\n"
+msgid "Invalid signature (%s)"
+msgstr "Firma no válida (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"uso: %s [opciones]\n"
-"donde [opciones] son\n"
+msgid "Invalid Key ID (%s)"
+msgstr "ID de clave no válida (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
+msgid "Missing signature (%s)"
+msgstr "Falta firma (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"no se puede utilizar el nombre «%s» para un soporte sin denominar porque ya "
-"se está utilizando"
+msgid "bad proxy declaration on command line\n"
+msgstr "declaración incorrecta del proxy en la línea de comandos\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - imprime etiq. conflicts: todos los conflictos.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"soporte virtual «%s» debería tener un hdlist fuente o síntesis válido, "
-"soporte ignorado"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Disculpe, elección incorrecta, reinténtelo\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -927,668 +829,736 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - imprime este mensaje de ayuda.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - seleccionar un paquete en las elecciones "
+"automáticamente.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"uso: urpmi.addmedia [opciones] <nombre> <url>\n"
-"donde <url> es uno de\n"
-"       file://<ruta>\n"
-"       ftp://<usuario>:<contraseña>@<host>/<ruta> with <nombre de hdlist "
-"relativo>\n"
-"       ftp://<host>/<ruta> with <nombre de hdlist relativo>\n"
-"       http://<host>/<ruta> with <nombre de hdlist relativo>\n"
-"       removable://<ruta>\n"
-"\n"
-"y [opciones] es uno o varios de\n"
+"  --test         - verificar si se puede llevar a cabo la instalación sin "
+"problemas.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copiando hdlist fuente (o síntesis) de «%s»..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - fuerza invocación aunque no existan algunos paquetes.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...copia hecha"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "no se puede utilizar la opción paralelo «%s»"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - usar otra raíz para la instalación de rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"soporte \"%s\" usa un archivo de lista no válido:\n"
-"  probablemente el sitio de réplica no está actualizado, intentando método "
-"alternativo"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access first installation medium"
-msgstr "no se puede acceder al primer soporte de la instalación"
+"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
+"distribución,\n"
+"                   útil para (des)instalar un chroot con la opción --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "soporte virtual debe ser local"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo informativo.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "error registering local packages"
-msgstr "error registrando paquetes locales"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona todas los paquetes que coincidan con la "
+"expresión.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
+msgid "unknown packages"
+msgstr "paquetes desconocidos "
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "encontrado hdlist por prueba (o síntesis) como «%s»"
+msgid "unknown package"
+msgstr "paquete desconocido "
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "falló la recuperación de hdlist fuente (o síntesis)"
+msgid "removing package %s will break your system"
+msgstr "quitar el paquete %s dañará su sistema"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "no se encontraron archivos rpm en [%s]"
+msgid "Nothing to remove"
+msgstr "Nada que quitar"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nada escrito en el archivo de lista para «%s»"
+msgid "Checking to remove the following packages"
+msgstr "Verificando para quitar los paquetes siguientes"
 
-#: ../urpmi:1
+#: ../urpme:106
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Los siguientes paquetes contienen firmas no válidas"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Para satisfacer las dependencias, se quitarán los paquetes siguientes (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "computando md5sum de hdlist fuente (o síntesis) existente"
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmq:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
+msgid "removing %s"
+msgstr "quitando %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "unable to install package %s"
-msgstr "no se puede instalar el paquete %s"
+msgid "Removing failed"
+msgstr "Falló la desinstalación"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - permitir preguntar al usuario para instalar paquetes sin\n"
-"                   verificar las dependencias ni la integridad.\n"
+"urmpf versión %s\n"
+"Copyright (C) 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"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Guardar archivo"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - usa sólo soporte de actualización.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - usar sólo soportes dados, separados por comas.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "no se puede escribir el archivo de configuración [%s]"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - no usar soportes dados, separados por coma.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  -a             - selecciona todas los paquetes que coincidan con la "
-"expresión.\n"
+"  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
+"coma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID de clave no válida (%s)"
+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:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - fuerza invocación aunque no existan algunos paquetes.\n"
+"  --quiet         - no imprime nombre de etiqueta (por defecto si no se "
+"proporciona\n"
+"etiqueta en la línea de comandos, incompatible con modo interactivo)\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "no se puede recuperar el nombre de ruta para medio extraíble «%s»"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - no imprime líneas idénticas.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - imprime todas las etiquetas.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usar síntesis provista en lugar de base de datos de "
-"urpmi.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - imprime etiqueta de grupo: group.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forzar actualización de clave gpg.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - imprime etiqueta de tamaño: size.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "falta <ruta relativa de hdlist>\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - imprime etiqueta de época: epoch.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Verificando para quitar los paquetes siguientes"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - imprime etiqueta resumen: summary.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "no pedido"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - imprime etiqueta de descripción: description.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "no se puede acceder al archivo rpm [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - imprime etiq. sourcerpm: rpm fuente.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - imprime etiq. archivos: todos archivos.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - imprime etiq. packager: quien lo empaquetó.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "no se puede analizar \"%s\" en el archivo [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - imprime etiq. buildhost: máquina en la que se construyó.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "¿Desea continuar con la instalación?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - imprime etiq. url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "no se puede leer el archivo rpm [%s] del soporte «%s»"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - imprime etiq. provides: todo que proporciona.\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
-"distribución,\n"
-"                   útil para instalar un chroot con la opción --root.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - imprime etiq. requires: todo que precisa.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - imprime etiq. archivos: todos archivos.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - imprimir información útil en formato legible para las "
-"personas.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - imprime etiq. conflicts: todos los conflictos.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - imprime etiq. obsoletes: todo lo obsoleto.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - usar versión de distribución especificada, por defecto,\n"
-"                   se toma la versión de la distribución indicada por el\n"
-"                   paquete mandrake-release instalado.\n"
+"  --env          - usar entorno específico (típicamente para reportar\n"
+"                   bugs).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  --from         - usar url especificada para la lista de réplicas, la\n"
-"                   predeterminada es %s\n"
+"  -i             - ignora distinción entre mayús. y minús. en todos los "
+"patrones.\n"
 
-#: ../urpme:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
-"distribución,\n"
-"                   útil para (des)instalar un chroot con la opción --root.\n"
+"  -f             - imprime versión, release y arquitectura con nombre.\n"
 
-#: ../urpmf:1
+#: ../urpmf:61
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NO unario, verdadero si la expresión es falsa.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
 
-#: ../urpmi:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"El directorio [%s] ya existe, por favor use otro directorio para reportar "
-"errores o bórrelo"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "desmontando %s"
+"  -a             - operador binario Y, verdadero si ambas expresiones son "
+"verdaderas.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:63
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - operador O binario, verdadero si una expresión es "
+"verdadera.\n"
 
-#: ../urpmi:1
+#: ../urpmf:64
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidad = %s"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NO unario, verdadero si la expresión es falsa.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid "restarting urpmi"
-msgstr "reiniciando urpmi"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - paréntesis izquierdo para abrir grupo de expresiones.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "examinando el archivo de síntesis [%s]"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - paréntesis derecho para cerrar grupo de expresiones.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"callback es :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "...copying failed"
-msgstr "...falló la copia"
+msgid "using specific environment on %s\n"
+msgstr "uasando un entorno específico en %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "no se puede acceder al archivo hdlist de «%s», soporte ignorado"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso.\n"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpi versión %s\n"
+"Copyright (C) 1999, 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:1
+#: ../urpmi:82
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo informativo.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usar síntesis provista en lugar de base de datos de "
+"urpmi.\n"
 
-#: ../urpmq:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-"  --sources      - da todos los paquetes fuentes antes de bajar (sólo "
-"root).\n"
+"  --auto-select  - seleccionar automáticamente paquetes para actualizar "
+"sistema.\n"
 
-#: ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  --headers      - extrae cabeceras para paquetes listados desde la\n"
-"                   bd de urpmi a stdout (sólo root).\n"
+"  --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
+"instalación.\n"
 
-#: ../urpme:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "unknown packages"
-msgstr "paquetes desconocidos "
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - mantener paquetes existentes si es posible, descartar "
+"pedidos\n"
+"                   de paquetes que lleven a quitarlos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "seleccionando soportes múltiples: %s"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - dividir en transacciones pequeñas si se van a actualizar\n"
+"                   o instalar más paquetes dados,\n"
+"                   %d es el predeterminado.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:91
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
-"  -f             - imprime versión, release y arquitectura con nombre.\n"
+"  --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "archivo [%s] ya utilizado en el mismo soporte «%s»"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - forzar búsqueda difusa (lo mismo que -y).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "no se puede encontrar el archivo de lista para «%s», soporte ignorado"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalar sólo paquete de fuentes (ningún binario)\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:95
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - imprime este mensaje de ayuda.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "se encontró manejador paralelo para los nodos: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mantener rpm no usado en cache.\n"
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"callback es :\n"
-"%s\n"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - búsqueda inversa de lo que necesita el paquete.\n"
+"  --allow-nodeps - permitir preguntar al usuario para instalar paquetes\n"
+"                   sin verificar las dependencias.\n"
 
-#: ../urpmf:1
+#: ../urpmi:100
 #, 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"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"urmpf versión %s\n"
-"Copyright (C) 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"
+"  --allow-force  - permitir preguntar al usuario para instalar paquetes sin\n"
+"                   verificar las dependencias ni la integridad.\n"
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"  --quiet         - no imprime nombre de etiqueta (por defecto si no se "
-"proporciona\n"
-"etiqueta en la línea de comandos, incompatible con modo interactivo)\n"
+"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
+"distribución,\n"
+"                   útil para instalar un chroot con la opción --root.\n"
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - no imprime líneas idénticas.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget para recuperar archivos remotos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr ""
-"--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
-"update o --parallel"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl para recuperar archivos remotos.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitar la velocidad de descarga.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --arch         - usar arquitectura especificada, lo predeterminado es la\n"
-"                   arquitectura del paquete mandrake-release instalado.\n"
+"  --resume       - resumir transferencia de archivos descargados "
+"parcialmente\n"
+"                   (--no-resume lo deshabilita, que es lo predeterminado).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "Is this OK?"
-msgstr "¿Está todo bien?"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - usar proxy HTTP especificado, se asume que el puerto es\n"
+"                   1080 por defecto (formato <hostproxy[:puerto]>).\n"
 
-#: ../urpmi:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - excluir archivos de documentación.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - especificar usuario y contraseña para utilizar en la\n"
+"                   autenticación del proxy (formato <usuario:contraseña>).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:115
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --synthesis    - usar la síntesis provista en vez de la base de datos de "
-"urpmi.\n"
+"  --bug          - emitir un reporte de bug en el directorio indicado\n"
+"                   por el argumento siguiente.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examinando el manejador paralelo en el archivo [%s]"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usar la interfaz X.\n"
 
-#: ../urpme:1
+#: ../urpmi:120
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nada que quitar"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - selecciona el mejor interfaz según el entorno:\n"
+"                   modo X o texto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - verificar la firma del rpm antes de la instalación.\n"
+"                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "leyendo encabezados del soporte «%s»"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath   - ruta de exclusión separada por coma.\n"
 
-#: ../urpmq:1
+#: ../urpmi:126
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - excluir archivos de documentación.\n"
 
-#: ../urpmi:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --bug          - emitir un reporte de bug en el directorio indicado\n"
-"                   por el argumento siguiente.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "el soporte «%s» no define ubicación alguna para archivos rpm"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - imprime etiq. sourcerpm: rpm fuente.\n"
+"  -a             - selecciona todas coincidencias en línea de comando.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "no se puede escribir el archivo de lista de «%s»"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - permite buscar en provides para encontrar paquete.\n"
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - imprime etiq. requires: todo que precisa.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p             - no buscar en «provides» para encontrar paquete.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "intentando seleccionar soporte inexistente \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - imprime etiqueta de descripción: description.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "Copying failed"
-msgstr "Falló la copia"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fuerza generación de archivos hdlist.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  se instalan los nombres o archivos rpm dados en línea de comandos.\n"
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes sólo se puede utilizar con --parallel"
+msgid "Choose location to save file"
+msgstr "Elija ubicación para guardar archivo"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
+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:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s          - sig. paquete es paquete fuente (igual que --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Seleccionó un paquete fuente:\n"
+"\n"
+"%s\n"
+"\n"
+"Probablemente no deseaba instalarlo en su computadora (instalarlo le\n"
+"permitiría realizar modificaciones al código fuente y luego recompilarlo).\n"
+"\n"
+"¿Que desea hacer?"
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "installing %s"
-msgstr "instalando %s"
+msgid "Do nothing"
+msgstr "Nada"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "leyendo archivos rpm de [%s]"
+msgid "Yes, really install it"
+msgstr "Sí, deseo instalarlo"
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copiando descripción de archivo de «%s»..."
+msgid "Save file"
+msgstr "Guardar archivo"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --auto         - seleccionar un paquete en las elecciones "
-"automáticamente.\n"
+"Está a punto de instalar el paquete de software siguiente en su "
+"computadora:\n"
+"\n"
+"%s\n"
+"\n"
+"Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
 
-#: ../urpme:1
+#: ../urpmi:230
 #, c-format
-msgid "Removing failed"
-msgstr "Falló la desinstalación"
+msgid "Install it"
+msgstr "Instalarlo"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  --virtual      - crear soporte virtual que siempre está actualizado,\n"
-"                   sólo se permite protocolo file://.\n"
+"El directorio [%s] ya existe, por favor use otro directorio para reportar "
+"errores o bórrelo"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "no se encontró el paquete %s."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "No se puede crear el directorio [%s] para reporte de bugs"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "quitando el soporte «%s»"
+msgid "Copying failed"
+msgstr "Falló la copia"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "no es necesario dar <ruta relativa de hdlist> con --distrib"
+msgid "Only superuser is allowed to install packages"
+msgstr "Sólo el superusuario está autorizado a instalar paquetes"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "One of the following packages is needed:"
+msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - sig. paquete es paquete fuente (igual que -s).\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¿Qué elige? (1-%d)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - usar entorno específico (típicamente para reportar\n"
-"                   bugs).\n"
+msgid "Package installation..."
+msgstr "Instalación de paquete..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Inicializando..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
-"coma.\n"
+"No se puede instalar algún paquete pedido:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "no se puede acceder al soporte «%s»"
+msgid "do you agree ?"
+msgstr "¿está de acuerdo?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "no se puede crear soporte «%s»\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"La instalación no puede continuar porque se tienen quitar los paquetes\n"
+"siguientes para poder actualizar otros:\n"
+"%s\n"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - imprime etiq. packager: quien lo empaquetó.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
+"%s"
 
-#: ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - volcar la configuración en forma de argumento para urpmi."
-"addmedia.\n"
+"Para satisfacer las dependencias, se instalarán los %d paquetes siguientes (%"
+"d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1597,390 +1567,427 @@ msgstr ""
 "Necesita ser root para instalar las dependencias siguientes:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - imprimir el registro de cambios.\n"
+msgid "unable to get source packages, aborting"
+msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "no se puede acceder al archivo de la lista de «%s», soporte ignorado"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - paréntesis derecho para cerrar grupo de expresiones.\n"
+msgid "Press Enter when ready..."
+msgstr "Presione «Intro» cuando esté listo..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "no se encontró webfetch, los webfetch soportados son: %s\n"
+msgid "Downloading package `%s'..."
+msgstr "Descargando paquete `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "examinando el archivo hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copiando archivo hdlists..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidad = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "escribiendo archivo de lista para el soporte «%s»"
+msgid "The following packages have bad signatures"
+msgstr "Los siguientes paquetes contienen firmas no válidas"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "soporte virtual «%s» debería tener una URL limpia, soporte ignorado"
+msgid "Do you want to continue installation ?"
+msgstr "¿Desea continuar con la instalación?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --buildhost    - imprime etiq. buildhost: máquina en la que se construyó.\n"
+"Falló la instalación, faltan algunos archivos:\n"
+"%s\n"
+"Puede querer actualizar su base de datos de urpmi"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Nada"
+msgid "Installation failed"
+msgstr "Falló la instalación"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "usando el soporte asociado para el modo paralelo: %s"
+msgid "distributing %s"
+msgstr "distribuyendo %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "montando %s"
+msgid "installing %s"
+msgstr "instalando %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"no se puede utilizar el soporte «%s» como archivo de lista que ya utiliza "
-"otro soporte"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando paquete `%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "no se pueden obtener los paquetes fuente, abortando"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - usar otra raíz para la instalación de rpm.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completado, ETA = %s, velocidad = %s"
+msgid "%d installation transactions failed"
+msgstr "fallaron %d transacciones de instalación"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "computando md5sum del hdlist fuente (o síntesis) recuperado"
+msgid "Installation is possible"
+msgstr "Es posible la instalación"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "no se puede importar archivo de clave pública de «%s»"
+msgid "Everything already installed"
+msgstr "ya está todo instalado"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
-"  --no-uninstall - nunca preguntar si desinstalar un paquete, cancelar la "
-"instalación.\n"
+msgid "restarting urpmi"
+msgstr "reiniciando urpmi"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"uso: urpmi.addmedia [opciones] <nombre> <url>\n"
+"donde <url> es uno de\n"
+"       file://<ruta>\n"
+"       ftp://<usuario>:<contraseña>@<host>/<ruta> with <nombre de hdlist "
+"relativo>\n"
+"       ftp://<host>/<ruta> with <nombre de hdlist relativo>\n"
+"       http://<host>/<ruta> with <nombre de hdlist relativo>\n"
+"       removable://<ruta>\n"
 "\n"
-"uso:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recuperando hdlist fuente (o síntesis) de «%s»..."
+"y [opciones] es uno o varios de\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea sólo soporte de actualización.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "el soporte «%s» no está seleccionado"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - intentar y encontrar archivo synthesis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Sólo el superusuario está autorizado a instalar paquetes"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uasando un entorno específico en %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - no intentar encontrar archivos synthesis o hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "no se puede encontrar el archivo hdlist para «%s», soporte ignorado"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crear automáticamente todos los soportes desde un\n"
+"                   soporte de instalación.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
+"  --distrib-XXX  - crear automáticamente un soporte para la parte XXX de\n"
+"                   una distribución, XXX puede ser main, contrib, updates o\n"
+"                   cualquier otra cosa que haya sido configurada ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  (              - paréntesis izquierdo para abrir grupo de expresiones.\n"
+"  --from         - usar url especificada para la lista de réplicas, la\n"
+"                   predeterminada es %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "demasiados puntos de montaje para medios extraíbles «%s»"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - usar versión de distribución especificada, por defecto,\n"
+"                   se toma la versión de la distribución indicada por el\n"
+"                   paquete mandrake-release instalado.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - operador binario Y, verdadero si ambas expresiones son "
-"verdaderas.\n"
+"  --arch         - usar arquitectura especificada, lo predeterminado es la\n"
+"                   arquitectura del paquete mandrake-release instalado.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"no se puede acceder soporte \"%s\",\n"
-"esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
+"  --virtual      - crear soporte virtual que siempre está actualizado,\n"
+"                   sólo se permite protocolo file://.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - imprime etiqueta de grupo: group.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - usar sólo soportes dados, separados por comas.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpia dir. encabezados de cache.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "no se puede crear transacción"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fuerza generación de archivos hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "obteniendo archivos rpm desde el soporte  «%s» ..."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "no se pueden añadir actualizaciones de una distribución cooker\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Seleccionó un paquete fuente:\n"
-"\n"
-"%s\n"
-"\n"
-"Probablemente no deseaba instalarlo en su computadora (instalarlo le\n"
-"permitiría realizar modificaciones al código fuente y luego recompilarlo).\n"
-"\n"
-"¿Que desea hacer?"
+msgid "retrieving mirrors at %s ..."
+msgstr "obteniendo sitios de réplica en %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "distribuyendo %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no es necesario dar <ruta relativa de hdlist> con --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Falló la instalación"
+msgid "unable to update medium \"%s\"\n"
+msgstr "no se puede actualizar soporte «%s»\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "escrito archivo de configuración [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "falta <ruta relativa de hdlist>\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
+msgid "`with' missing for network media\n"
+msgstr "falta «with» para soporte de red\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - imprime etiqueta de época: epoch.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "no se puede crear soporte «%s»\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - verificar la firma del rpm antes de la instalación.\n"
-"                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
+"uso: urpmi.removemedia [-a] <nombre> ...\n"
+"donde <nombre> es nombre del soporte a borrar.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona todos los soportes.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea sólo soporte de actualización.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opciones desconocidas «%s»\n"
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada para quitar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"falta la entrada a quitar\n"
+"(una de %s)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uso: urpmi.update [opciones] <nombre> ...\n"
+"donde <nombre> es nombre de soporte para actualizar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:38
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descripción de hdlist no válida «%s» en archivo hdlists"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - actualizar sólo el soporte de actualización.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:40
 #, c-format
-msgid "removing %s"
-msgstr "quitando %s"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forzar actualización de clave gpg.\n"
+
+#: ../urpmi.update:41
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selecciona todos los soportes no extraíbles.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
+
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --distrib-XXX  - crear automáticamente un soporte para la parte XXX de\n"
-"                   una distribución, XXX puede ser main, contrib, updates o\n"
-"                   cualquier otra cosa que haya sido configurada ;-)\n"
+"falta la entrada a actualizar\n"
+"(una de %s)\n"
 
-#: ../urpmf:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpf versión %s\n"
+"Copyright (C) 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"
+
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - imprime etiqueta de tamaño: size.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista los paquetes disponibles.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
-msgstr "para mantener %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista los soportes disponibles.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "debido a que no se satisfizo %s"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url     - lista los soportes disponibles junto con sus URL.\n"
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Instalación automática de paquetes...\n"
-"Pidió la instalación del paquete %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "base de datos de urpmi bloqueada"
+"  --dump-config  - volcar la configuración en forma de argumento para urpmi."
+"addmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --resume       - resumir transferencia de archivos descargados "
-"parcialmente\n"
-"                   (--no-resume lo deshabilita, que es lo predeterminado).\n"
+"  --list-nodes   - lista los nodos disponibles cuando se usa --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "examinando archivo de clave pública de «%s»..."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lista los alias paralelo disponibles.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extrae cabeceras para paquetes listados desde la\n"
+"                   bd de urpmi a stdout (sólo root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tomar dispositivo extraíble como «%s»"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - da todos los paquetes fuentes antes de bajar (sólo "
+"root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Está a punto de instalar el paquete de software siguiente en su "
-"computadora:\n"
-"\n"
-"%s\n"
-"\n"
-"Puede que prefiera sólo guardarlo. ¿Cuál es su elección?"
+"  --use-distrib  - configurar urpmi al vuelo desde un árbol de "
+"distribución.\n"
+"                   Esto permite consultar una distro.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - forzar búsqueda difusa (lo mismo que -y).\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - imprimir el registro de cambios.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extiende consulta a las dependencias del paquete.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1989,42 +1996,81 @@ msgstr ""
 "  -u             - quitar paquete si ya está instalada una versión más "
 "reciente.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - completar salida con paquete(s) a quitar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "debido a que falta %s"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - búsqueda inversa de lo que necesita el paquete.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - usa sólo soporte de actualización.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - imprimir información útil en formato legible para las "
+"personas.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprimir los grupos junto con los nombres.\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - imprimir versión y revisión junto con el nombre.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista los archivos en el paquete.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"uso: urpmi.update [opciones] <nombre> ...\n"
-"donde <nombre> es nombre de soporte para actualizar.\n"
+"  los nombres o archivos rpm dados en línea de comandos se consultan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "intentando pasar al soporte existente «%s», evitando"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes sólo se puede utilizar con --parallel"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test         - verificar si se puede llevar a cabo la instalación sin "
-"problemas.\n"
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "no se encontró la lista completa de soportes"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "¡¡¡programa para bajar de la red «%s» desconocido!!!\n"
@@ -2195,9 +2241,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "pruebe urpmf --help para más opciones"
 
-#~ msgid "no full media list was found"
-#~ msgstr "no se encontró la lista completa de soportes"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "copiando lista fuente de «%s»..."
 
diff --git a/po/et.po b/po/et.po
index 99f02b66..4425dedd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-06 23:07+0300\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -34,869 +34,777 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "EeNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s paigaldamine\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
+"Automaatne pakettide paigaldamine...\n"
+"Soovisite paigaldada paketti %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb avamine ebaõnnestus"
+msgid "Is this OK?"
+msgstr "Kas sobib?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - näitab seda abiteadet.\n"
+msgid "Ok"
+msgstr "Olgu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s paigaldamiseks on vajalik üks järgnevatest pakettidest:"
+msgid "Cancel"
+msgstr "Loobu"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "paketi %s eemaldamine"
+msgid " (Y/n) "
+msgstr " (J/e) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: ei tunne seda käsku\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Paralleelresiimi ei saa kasutada koos võtmega use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"kasutamine: %s [võtmed]\n"
+"kus [võtmed] on\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Kõik on juba paigaldatud"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - näitab seda abiteadet.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [grupp]     - piirab tulemused määratud grupiga.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "tehinguks kasutatakse protsessi %d"
+msgid "                    defaults is %s.\n"
+msgstr "                    vaikimisi on %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - näitab välja provides: kõik pakutavad.\n"
+msgid "unknown protocol defined for %s"
+msgstr "tundmatu protokoll %s jaoks"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Millise valite? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "puhvris leiti %d päis(t)"
+msgid "unable to handle protocol: %s"
+msgstr "ei suuda käsitleda protokolli: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "mitu paketti kannab üht ja sama rpm faili nime \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "süntaksiviga seadistustefailis real %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - määrab kasutajanime ja parooli vahendaja\n"
-"                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
+"andmekandja \"%s\" püüab kasutada juba kasutusel hdlisti, seda eiratakse"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "teistkordne sõltuvuste arvutamine\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"andmekandja \"%s\" püüab kasutada juba kasutusel nimekirja, seda eiratakse"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "rpm faili [%s] tõmbamine..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"andmekandjat \"%s\" ei saa arvestada, sest selle nimekirjafaili kasutab juba "
+"muu andmekandja"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - näitab saadaolevaid aliaseid.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nime \"%s\" kasutamine nimetul andmekandjal pole võimalik, sest nimi on juba "
+"kasutusel"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...tõmbamine ebaõnnestus: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"andmekandjat \"%s\" ei saa arvestada, sest sel puudub nimekirjafail [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" nimekirjafaili uurimine ebaõnnestus, andmekandjat eiratakse"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "andmekandja määramine hdlist-failile [%s] ebaõnnestus"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binaaroperaator OR: tõene, kui üks avaldis on tõene.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ligipääs \"%s\" hdlist failile ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Paketi paigaldamine..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ligipääs \"%s\" nimekirjafailile ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "vigane rpm-faili nimi [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "käsureal on määratud vigane vahendaja\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuaalsel andmekandjal \"%s\" ei peaks olema määratud hdlisti või "
+"nimekirjafaili, seda eiratakse"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d paigaldamistehingut ebaõnnestus"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuaalsel andmekandjal \"%s\" peaks olema selge URL, seda eiratakse"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ligpääs esimesele paigaldus-andmekandjale ebaõnnestus (ei leitud faili "
-"Mandrake/base/hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ei leitud \"%s\" hdlist faili, andmekandjat eiratakse"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ei leitud \"%s\" nimekirjafaili, andmekandjat eiratakse"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Valige faili salvestamise koht"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" ebaühtlane nimekirjafail, andmekandjat eiratakse"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - näitab välja summary: kokkuvõte.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" nimekirjafaili uurimine ebaõnnestus, andmekandjat eiratakse"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järgmistes pakettides: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Paigalda"
+msgid "taking removable device as \"%s\""
+msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - kasutatakse X-i.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgnevatest pakettidest:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "seadistustefaili [%s] kirjutamine ebaõnnestus"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - valib vastavalt keskkonnale parima resiimi: kas X või\n"
-"                   tekstiresiim.\n"
+msgid "write config file [%s]"
+msgstr "seadistustefaili [%s] kirjutamine"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Paketi '%s' allalaadimine..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Paralleelresiimi ei saa kasutada koos võtmega use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mida teha binaarsete rpm failidega võtme --install-src kasutamisel"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%s\" parsimine failis [%s] ebaõnnestus"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "paralleelkäitleja uurimine failis [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "paketti nimega %s ei ole"
+msgid "found parallel handler for nodes: %s"
+msgstr "leiti paralleelkäitleja sõlmedele: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "seostatava andmekandja kasutamine paralleelresiimis: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Paigaldamine ebaõnnestus, mõned failid on puudu:\n"
-"%s\n"
-"Te võiksite ehk uuendada urpmi andmebaasi"
+msgid "unable to use parallel option \"%s\""
+msgstr "paralleelvõtme \"%s\" kasutamine ebaõnnestus"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"kasutamine: urpmi.removemedia [-a] <nimi> ...\n"
-"kus <nimi> on eemaldatava andmekandja nimi.\n"
+"võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
+"sortmedia, --update või --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
-"järgmised paketid:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "võrguandmekandjal peab olema määratud `with'\n"
+msgid "examining hdlist file [%s]"
+msgstr "hdlist faili [%s] uurimine"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - näitab faile paketis.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuaalne andmekandja \"%s\" ei ole kohalik, seda eiratakse"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "tundmatu pakett"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "probleem andmekandja \"%s\" hdlist või sünteesifaili lugemisel"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Paigaldamine on võimalik"
+msgid "performing second pass to compute dependencies\n"
+msgstr "teistkordne sõltuvuste arvutamine\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "pakett %s jäetakse vahele"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"andmekandjat \"%s\" ei saa arvestada, sest sel puudub nimekirjafail [%s]"
+msgid "unable to open rpmdb"
+msgstr "rpmdb avamine ebaõnnestus"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
+msgid "medium \"%s\" already exists"
+msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "cookeri distributsiooni uuenduste lisamine ebaõnnestus\n"
+msgid "virtual medium need to be local"
+msgstr "virtuaalne andmekandja peab olema kohalik"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - selgitav resiim.\n"
+msgid "added medium %s"
+msgstr "lisati andmekandja %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initsialiseerimine..."
+msgid "unable to access first installation medium"
+msgstr "ligipääs esimesele paigaldus-andmekandjale ebaõnnestus"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - näitab saadaolevaid pakette.\n"
+msgid "copying hdlists file..."
+msgstr "faili hdlists kopeerimine..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - näitab kõiki välju.\n"
+msgid "...copying failed"
+msgstr "...kopeerimine ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
+msgid "...copying done"
+msgstr "...kopeerimine tehtud"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuaalsel andmekandjal \"%s\" ei peaks olema määratud hdlisti või "
-"nimekirjafaili, seda eiratakse"
+"ligpääs esimesele paigaldus-andmekandjale ebaõnnestus (ei leitud faili "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "kopeeritud allika hdlisti (või sünteesi) MD5SUM arvutamine"
+msgid "retrieving hdlists file..."
+msgstr "hdlists faili tõmbamine..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
+msgid "...retrieving done"
+msgstr "...tõmbamine tehtud"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Vajutage Enter, kui see on tehtud..."
+msgid "...retrieving failed: %s"
+msgstr "...tõmbamine ebaõnnestus: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tundmatu võti '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "vigane hdlisti kirjeldus \"%s\" failis hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - jagab väikesteks tehinguteks, kui paigaldatakse või\n"
-"                   uuendatakse enam kui määratud arv pakette,\n"
-"                   vaikimisi on see %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "probleem andmekandja \"%s\" hdlist või sünteesifaili lugemisel"
+msgid "selecting multiple media: %s"
+msgstr "mitme andmekandja valik: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
+msgid "removing medium \"%s\""
+msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
-"parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "hdlist [%s] loomine"
+"andmekandjat \"%s\" ei õnnestunud leida,\n"
+"mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
-"                   soovitud paketid, mis toovad kaasa eemaldamise.\n"
+"virtuaalsel andmekandjal \"%s\" peaks olema kehtiv hdlist või süntees, seda "
+"eiratakse"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM faili uurimine"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ei tunne seda käsku\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "olemasoleva allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm faili registreerimine ebaõnnestus"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM faili uurimine"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - lubab kasutajal paigaldamise\n"
-"                   pakettide sõltuvusi kontrollimata.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" allika hdlisti (või sünteesi) kopeerimine..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ei suuda käsitleda protokolli: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s] kopeerimine ebaõnnestus (fail on kahtlaselt väike)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists faili tõmbamine..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "kopeeritud allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Paigalda"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] kopeerimine ebaõnnestus (MD5SUM ei klapi)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "lisati andmekandja %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - säilitab puhvris mittekasutatud rpm-i.\n"
+msgid "reading rpm files from [%s]"
+msgstr "[%s] rpm failide lugemine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s] rpm failide lugemine ebaõnnestus: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "MD5SUM ei klapi"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] ei sisalda rpm faile"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "süntaksiviga seadistustefailis real %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" allika hdlisti (või sünteesi) tõmbamine..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  paigaldatakse käsureal antud nimed või rpm-failid.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "leiti kontrollitud hdlist (või süntees) %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - kasutatakse määratud HTTP vahendajat, pordinumber on "
-"eeldatavalt\n"
-"                   vaikimisi 1080 (vorming on <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "tõmmatud allika hdlisti (või sünteesi) MD5SUM arvutamine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "paigaldamaks %s"
+msgid "md5sum mismatch"
+msgstr "MD5SUM ei klapi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "depslisti kanti %s kirjet"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "allika hdlisti (või sünteesi) tõmbamine ebaõnnestus"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - tõstutundetu igas olukorras.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "andmekandjale \"%s\" ei leitud hdlist faili"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fail [%s] on juba kasutusel samal andmekandjal \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" hdlist faili analüüs ebaõnnestus"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "peeglite tõmbamine asukohast %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" nimekirjafaili kirjutamine ebaõnnestus"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - näitab välja url: URL.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "andmekandja \"%s\" nimekirjafaili kirjutamine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "tundmatu protokoll %s jaoks"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" nimekirjafaili ei kirjutatud midagi"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - näitab välja obsoletes: kõik iganenud.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "andmekandja \"%s\" on juba olemas"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "\"%s\" avaliku võtme faili import ebaõnnestus"
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "%s paigaldamine\n"
+msgid "reading headers from medium \"%s\""
+msgstr "päiste lugemine andmekandjalt \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"puudub uuendatava kirje nimi\n"
-"(võimalikud: %s)\n"
+msgid "building hdlist [%s]"
+msgstr "hdlist [%s] loomine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "püüan välja pakkuda %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "loodi hdlist sünteesifail andmekandjale \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paketi %s eemaldamine ebaõnnestus"
+msgid "found %d headers in cache"
+msgstr "puhvris leiti %d päis(t)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
+msgid "removing %d obsolete headers in cache"
+msgstr "puhvrist eemaldati %d iganenud päis(t)"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"puudub eemaldatava kirje nimi\n"
-"(võimalikud: %s)\n"
+msgid "mounting %s"
+msgstr "%s haakimine"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - valib kõik andmekandjad.\n"
+msgid "unmounting %s"
+msgstr "%s lahutamine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Puudub signatuur (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "depslisti kanti %s kirjet"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s] rpm failide lugemine ebaõnnestus: %s"
+msgid "no entries relocated in depslist"
+msgstr "depslisti ei kantud ühtegi kirjet"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
-"masina.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "vigane rpm-faili nimi [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s] kopeerimine ebaõnnestus (fail on kahtlaselt väike)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "rpm faili [%s] tõmbamine..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - uuendab ainult uuendus-andmekandjat.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "ligipääs rpm failile [%s] ebaõnnestus"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/e) "
+msgid "unable to register rpm file"
+msgstr "rpm faili registreerimine ebaõnnestus"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [grupp]     - piirab tulemused määratud grupiga.\n"
+msgid "error registering local packages"
+msgstr "viga kohalike pakettide registreerimisel"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"andmekandja \"%s\" püüab kasutada juba kasutusel nimekirja, seda eiratakse"
+msgid "no package named %s"
+msgstr "paketti nimega %s ei ole"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "vigane sisend: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järgmistes pakettides: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "paketi %s eemaldamine halvab Teie süsteemi"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "mitu paketti kannab üht ja sama rpm faili nime \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - näitab saadaolevaid andmekandjaid.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "[%s] analüüsimine väärtusel \"%s\" ebaõnnestus"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Mõnda soovitud paketti ei õnnestunud paigaldada:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Paketi '%s' paigaldamine (%s/%s)..."
+"andmekandja \"%s\" kasutab vigast nimekirjafaili:\n"
+"  peegel ei ole võib-olla uuendatud, proovige mõnda muud meetodit"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "depslisti ei kantud ühtegi kirjet"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "andmekandja \"%s\" ei määra ühtegi rpm failide asukohta"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
+msgid "package %s is not found."
+msgstr "paketti %s ei leitud."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - curl kasutamine kaugfailide tõmbamiseks.\n"
+msgid "urpmi database locked"
+msgstr "urpmi andmebaas on lukus"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "andmekandja \"%s\" ei ole valitud"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Kas olete nõus?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm faili [%s] lugemine andmekandjalt \"%s\" ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" ebaühtlane nimekirjafail, andmekandjat eiratakse"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "andmekandja \"%s\" on kirjas eemaldatavana, aga ei ole seda mitte"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...tõmbamine tehtud"
+msgid "unable to access medium \"%s\""
+msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "paketi %s lisamine (id=%d, eid=%d, uuendus=%d, fail=%s)"
+msgid "malformed input: [%s]"
+msgstr "vigane sisend: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "pakett %s jäetakse vahele"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm failide tõmbamine andmekandjalt \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Vigane signatuur (%s)"
+msgid "Preparing..."
+msgstr "Valmistun..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  päringu esitamine käsureal antud nimede või rpm-failide kohta.\n"
+msgid "using process %d for executing transaction"
+msgstr "tehinguks kasutatakse protsessi %d"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versioon %s\n"
-"Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "[%s] analüüsimine väärtusel \"%s\" ebaõnnestus"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
-"koma).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "andmekandja määramine hdlist-failile [%s] ebaõnnestus"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" hdlist faili analüüs ebaõnnestus"
+"tehing %s paigaldamiseks loodud (eemaldus=%d, paigaldus=%d, uuendus=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"andmekandja \"%s\" püüab kasutada juba kasutusel hdlisti, seda eiratakse"
+msgid "unable to create transaction"
+msgstr "tehingu loomine ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "konflikti tõttu %s-ga"
+msgid "removing package %s"
+msgstr "paketi %s eemaldamine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "puhvrist eemaldati %d iganenud päis(t)"
+msgid "unable to remove package %s"
+msgstr "paketi %s eemaldamine ebaõnnestus"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "paketi %s lisamine (id=%d, eid=%d, uuendus=%d, fail=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
+msgid "unable to install package %s"
+msgstr "paketi %s paigaldamine ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuaalne andmekandja \"%s\" ei ole kohalik, seda eiratakse"
+msgid "due to missing %s"
+msgstr "puuduva %s tõttu"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Valmistun..."
+msgid "due to unsatisfied %s"
+msgstr "rahuldamata %s tõttu"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    vaikimisi on %s.\n"
+msgid "trying to promote %s"
+msgstr "püüan välja pakkuda %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "kasutatakse teist eemaldatavat seadet [%s] \"%s\" jaoks"
+msgid "in order to keep %s"
+msgstr "säilitamaks %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ei püüta kasutada sünteesi-\n"
-"                   või hdlist-faili.\n"
+msgid "in order to install %s"
+msgstr "paigaldamaks %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
+msgid "due to conflicts with %s"
+msgstr "konflikti tõttu %s-ga"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] kopeerimine ebaõnnestus (MD5SUM ei klapi)"
+msgid "unrequested"
+msgstr "soovimata"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal.\n"
-"                   Võimaldab esitada päringu distributsiooni kohta.\n"
+msgid "Invalid signature (%s)"
+msgstr "Vigane signatuur (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"kasutamine: %s [võtmed]\n"
-"kus [võtmed] on\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Vigane võtme ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - eemaldab enne muud tegevust rpm-i puhvrist.\n"
+msgid "Missing signature (%s)"
+msgstr "Puudub signatuur (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nime \"%s\" kasutamine nimetul andmekandjal pole võimalik, sest nimi on juba "
-"kasutusel"
+msgid "bad proxy declaration on command line\n"
+msgstr "käsureal on määratud vigane vahendaja\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - näitab välja conflicts: kõik konfliktid.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: rpm faili \"%s\" lugemine ebaõnnestus\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuaalsel andmekandjal \"%s\" peaks olema kehtiv hdlist või süntees, seda "
-"eiratakse"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Vabandust, selline valik ei ole lubatud. Proovige uuesti\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -913,1091 +821,1229 @@ msgstr ""
 "\n"
 "kasutamine:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - näitab seda abiteadet.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"kasutamine: urpmi.addmedia [võti] <nimi> <url> [with <suhteline_tee>]\n"
-"kus <url> on esitatud kujul\n"
-"       file://<asukoht>\n"
-"       ftp://<kasutajanimi>:<parool>@<masin>/<asukoht> with <suhteline tee "
-"hdlist juurde>\n"
-"       ftp://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
-"       http://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
-"       removable://<tee>\n"
-"\n"
-"ja [võti] on üks järgmistest\n"
+"  --test         - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" allika hdlisti (või sünteesi) kopeerimine..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
+"olemas.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopeerimine tehtud"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
+"masina.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "paralleelvõtme \"%s\" kasutamine ebaõnnestus"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - muu baasi kasutamine rpm-ide paigaldamisel.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"andmekandja \"%s\" kasutab vigast nimekirjafaili:\n"
-"  peegel ei ole võib-olla uuendatud, proovige mõnda muud meetodit"
+"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
+"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
+"root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ligipääs esimesele paigaldus-andmekandjale ebaõnnestus"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - selgitav resiim.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuaalne andmekandja peab olema kohalik"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "viga kohalike pakettide registreerimisel"
+msgid "unknown packages"
+msgstr "tundmatud paketid"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
+msgid "unknown package"
+msgstr "tundmatu pakett"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "leiti kontrollitud hdlist (või süntees) %s"
+msgid "removing package %s will break your system"
+msgstr "paketi %s eemaldamine halvab Teie süsteemi"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "allika hdlisti (või sünteesi) tõmbamine ebaõnnestus"
+msgid "Nothing to remove"
+msgstr "Pole midagi eemaldada"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] ei sisalda rpm faile"
+msgid "Checking to remove the following packages"
+msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" nimekirjafaili ei kirjutatud midagi"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Järgmistel pakettidel on vigane signatuur"
+msgid " (y/N) "
+msgstr " (j/E) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "olemasoleva allika hdlisti (või sünteesi) MD5SUM arvutamine"
+msgid "removing %s"
+msgstr "%s eemaldamine"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - täielik väljund eemaldatavate pakettidega.\n"
+msgid "Removing failed"
+msgstr "Eemaldamine ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versioon %s\n"
+"Autoriõigus (C) 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "paketi %s paigaldamine ebaõnnestus"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
+"koma).\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia        - ei kasutata määratud andmekandjaid (eraldajaks "
+"koma).\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
-"                   sõltuvusi ja sobivust kontrollimata.\n"
+"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
+"koma).\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Salvesta fail"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - kasutab sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: rpm faili \"%s\" lugemine ebaõnnestus\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - selgitav resiim.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "seadistustefaili [%s] kirjutamine ebaõnnestus"
+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\n"
+"                    käsureal, mis ei sobi interaktiivsesse resiimi).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Vigane võtme ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - näitab kõiki välju.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
-"olemas.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - näitab välja group: grupp.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "eemaldatava andmekandja \"%s\" asukoha hankimine ebaõnnestus"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - näitab välja size: suurus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - näitab välja epoch: epohh.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - näitab välja summary: kokkuvõte.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - näitab välja description: kirjeldus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "Puudub <suhteline tee hdlist juurde>\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - näitab välja sourcerpm: lähtekoodi rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrollitakse, kas on võimalik eemaldada järgmised paketid"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - näitab välja packager: paketi valmistaja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "soovimata"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - näitab välja buildhost: valmistajamasin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ligipääs rpm failile [%s] ebaõnnestus"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - näitab välja url: URL.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - näitab välja files: kõik failid.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - näitab välja provides: kõik pakutavad.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%s\" parsimine failis [%s] ebaõnnestus"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - näitab välja requires: kõik nõutavad.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Kas jätkata paigaldusega?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - näitab välja files: kõik failid.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm faili [%s] lugemine andmekandjalt \"%s\" ebaõnnestus"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - näitab välja conflicts: kõik konfliktid.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - näitab välja obsoletes: kõik iganenud.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
-"                   kasulik chroot paigaldamiseks võtmega --root.\n"
+"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
+"                   vearaportideks).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "loodi hdlist sünteesifail andmekandjale \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
+"  -f             - näitab koos nimega versiooni, väljalaset ja "
+"arhitektuuri.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - kasutab määratud versiooni, vaikimisi on see\n"
-"                   paigaldatud paketi 'mandrake-release' versioon.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
-"                   on see %s\n"
+"  -a             - binaaroperaator AND: tõene, kui mõlemad avaldised on "
+"tõesed.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
-"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
-"root.\n"
+"  -o             - binaaroperaator OR: tõene, kui üks avaldis on tõene.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - binaaroperaator NOT: tõene, kui avaldis on väär.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - vasakpoolne sulg rühmaavaldise alustamiseks.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - parempoolne sulg rühmaavaldise lõpetamiseks.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
-"või kustutage see"
+"väljakutse on :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s lahutamine"
+msgid "using specific environment on %s\n"
+msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% tehtud, kiirus = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versioon %s\n"
+"Autoriõigus (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi taaskäivitamine"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sünteesifaili [%s] uurimine"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - valib automaatselt paketid süsteemi uuendamiseks.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
+"loobuda.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopeerimine ebaõnnestus"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - säilitab võimalusel olemasolevad paketid, lükkab tagasi\n"
+"                   soovitud paketid, mis toovad kaasa eemaldamise.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ligipääs \"%s\" hdlist failile ebaõnnestus, andmekandjat eiratakse"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - jagab väikesteks tehinguteks, kui paigaldatakse või\n"
+"                   uuendatakse enam kui määratud arv pakette,\n"
+"                   vaikimisi on see %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - vaikne resiim.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - selgitav resiim.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - lubab ebatäpset otsingut (sama, mis -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
-"(ainult administraator).\n"
+"  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - pakettide päised loetakse urpmi andmebaasist "
-"standardväljundisse\n"
-"                   (ainult administraator).\n"
+"  --install-src  - paigaldab ainult lähtetekstipaketi (mitte binaarpaketi).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "tundmatud paketid"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - eemaldab enne muud tegevust rpm-i puhvrist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "mitme andmekandja valik: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - säilitab puhvris mittekasutatud rpm-i.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - näitab koos nimega versiooni, väljalaset ja "
-"arhitektuuri.\n"
+"  --allow-nodeps - lubab kasutajal paigaldamise\n"
+"                   pakettide sõltuvusi kontrollimata.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fail [%s] on juba kasutusel samal andmekandjal \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - lubab kasutajal paigaldada pakette ilma\n"
+"                   sõltuvusi ja sobivust kontrollimata.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal,\n"
+"                   kasulik chroot paigaldamiseks võtmega --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ei leitud \"%s\" nimekirjafaili, andmekandjat eiratakse"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - wget kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - näitab seda abiteadet.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - curl kasutamine kaugfailide tõmbamiseks.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "leiti paralleelkäitleja sõlmedele: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - piirab allalaadimiskiirust.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"väljakutse on :\n"
-"%s\n"
+"  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
+"                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - kohandab otsingu sellele, mida pakett nõuab.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - kasutatakse määratud HTTP vahendajat, pordinumber on "
+"eeldatavalt\n"
+"                   vaikimisi 1080 (vorming on <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versioon %s\n"
-"Autoriõigus (C) 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
+"  --proxy-user   - määrab kasutajanime ja parooli vahendaja\n"
+"                   autentimiseks (vorming: <kasutajanimi:parool>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - välja nime ei näidata (vaikimisi, kui välja ei ole antud\n"
-"                    käsureal, mis ei sobi interaktiivsesse resiimi).\n"
+"  --bug          - väljastab vearaporti kataloogi, mis on ära näidatud\n"
+"                   järgnevas argumendis.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - kasutatakse X-i.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
-"sortmedia, --update või --parallel"
+"  --best-output  - valib vastavalt keskkonnale parima resiimi: kas X või\n"
+"                   tekstiresiim.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - kasutab määratud arhitektuuri, vaikimisi on see\n"
-"                   paigaldatud paketi 'mandrake-release' arhitektuur.\n"
+"  --verify-rpm   - kontrollib rpm signatuuri enne paigaldust\n"
+"                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Kas sobib?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eirab asukohta (või asukohti, eraldajaks koma).\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - jätab välja dokumentatsioonifailid.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - kasutab sünteesi urpmi andmebaasi asemel.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "paralleelkäitleja uurimine failis [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - lubab pakette otsida pakutavate seas.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Pole midagi eemaldada"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ei luba pakettide otsimist pakutavate seas.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "päiste lugemine andmekandjalt \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - vaikne resiim.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - väljastab vearaporti kataloogi, mis on ära näidatud\n"
-"                   järgnevas argumendis.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  paigaldatakse käsureal antud nimed või rpm-failid.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "andmekandja \"%s\" ei määra ühtegi rpm failide asukohta"
+msgid "Choose location to save file"
+msgstr "Valige faili salvestamise koht"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - näitab välja sourcerpm: lähtekoodi rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mida teha binaarsete rpm failidega võtme --install-src kasutamisel"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" nimekirjafaili kirjutamine ebaõnnestus"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Valisite lähtekoodi paketi.\n"
+"\n"
+"%s\n"
+"\n"
+"On väheusutav, et Te tahate seda tõesti arvutile paigaldada (kui Te\n"
+"ei soovi just seda ise muuta ja uuesti kompileerida).\n"
+"\n"
+"Mida nüüd ette võtta?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - näitab välja requires: kõik nõutavad.\n"
+msgid "Do nothing"
+msgstr "Mitte midagi"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "püüti valida olematut andmekandjat \"%s\""
+msgid "Yes, really install it"
+msgstr "Paigalda"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - näitab välja description: kirjeldus.\n"
+msgid "Save file"
+msgstr "Salvesta fail"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopeerimine ebaõnnestus"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Kavatsete paigaldada oma arvutile järgmise tarkvarapaketi:\n"
+"\n"
+"%s\n"
+"\n"
+"Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
+msgid "Install it"
+msgstr "Paigalda"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Kataloog [%s] on juba olemas, palun kasutage vearaportideks muud kataloogi "
+"või kustutage see"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "andmekandjale \"%s\" ei leitud hdlist faili"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kataloogi [%s] loomine vearaportideks ebaõnnestus"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - järgmine pakett on lähtetekstipakett (sama, mis --src).\n"
+msgid "Copying failed"
+msgstr "Kopeerimine ebaõnnestus"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "%s paigaldamine"
+msgid "Only superuser is allowed to install packages"
+msgstr "Pakette võib paigaldada ainult administraator"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s] rpm failide lugemine"
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" kirjelduste faili kopeerimine..."
+msgid "What is your choice? (1-%d) "
+msgstr "Millise valite? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+msgid "Package installation..."
+msgstr "Paketi paigaldamine..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Eemaldamine ebaõnnestus"
+msgid "Initializing..."
+msgstr "Initsialiseerimine..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
-"                   lubatud on ainult protokoll file://.\n"
+"Mõnda soovitud paketti ei õnnestunud paigaldada:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "paketti %s ei leitud."
+msgid "do you agree ?"
+msgstr "Kas olete nõus?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "andmekandja \"%s\" eemaldamine"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Paigaldamist ei saa jätkata, sest teiste uuendamiseks tuleb eemaldada\n"
+"järgmised paketid:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
+"Teiste uuendamiseks tuleb eemaldada järgmised paketid:\n"
+"%s"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
-msgstr "Loobu"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti (%d MB)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --src          - järgmine pakett on lähtetekstipakett (sama, mis -s).\n"
+"Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
-"                   vearaportideks).\n"
+msgid "unable to get source packages, aborting"
+msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
-"koma).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ligipääs andmekandjale \"%s\" ebaõnnestus"
+msgid "Press Enter when ready..."
+msgstr "Vajutage Enter, kui see on tehtud..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
+msgid "Downloading package `%s'..."
+msgstr "Paketi '%s' allalaadimine..."
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - näitab välja packager: paketi valmistaja.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s-st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% tehtud, kiirus = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Järgmistel pakettidel on vigane signatuur"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Kas jätkata paigaldusega?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Järgmiste sõltuvuste paigaldamiseks peate olema administraator:\n"
+"Paigaldamine ebaõnnestus, mõned failid on puudu:\n"
 "%s\n"
+"Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - näitab muutuste logi.\n"
+msgid "Installation failed"
+msgstr "Paigaldamine ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ligipääs \"%s\" nimekirjafailile ebaõnnestus, andmekandjat eiratakse"
+msgid "distributing %s"
+msgstr "%s jaotamine"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parempoolne sulg rühmaavaldise lõpetamiseks.\n"
+msgid "installing %s"
+msgstr "%s paigaldamine"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "veebitõmbajat ei leitud, toetatud on programm %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "hdlist faili [%s] uurimine"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Kas proovida paigaldust ilma sõltuvusi kontrollimata? (j/E)"
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "faili hdlists kopeerimine..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Kas proovida paigaldust veel jõulisemalt (--force)? (j/E) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "andmekandja \"%s\" nimekirjafaili kirjutamine"
+msgid "%d installation transactions failed"
+msgstr "%d paigaldamistehingut ebaõnnestus"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuaalsel andmekandjal \"%s\" peaks olema selge URL, seda eiratakse"
+msgid "Installation is possible"
+msgstr "Paigaldamine on võimalik"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - näitab välja buildhost: valmistajamasin.\n"
+msgid "Everything already installed"
+msgstr "Kõik on juba paigaldatud"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Mitte midagi"
+msgid "restarting urpmi"
+msgstr "urpmi taaskäivitamine"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"kasutamine: urpmi.addmedia [võti] <nimi> <url> [with <suhteline_tee>]\n"
+"kus <url> on esitatud kujul\n"
+"       file://<asukoht>\n"
+"       ftp://<kasutajanimi>:<parool>@<masin>/<asukoht> with <suhteline tee "
+"hdlist juurde>\n"
+"       ftp://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
+"       http://<masin>/<asukoht> with <suhteline tee hdlist juurde>\n"
+"       removable://<tee>\n"
+"\n"
+"ja [võti] on üks järgmistest\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "seostatava andmekandja kasutamine paralleelresiimis: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - loob uuendatava andmekandja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s haakimine"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis             - püütakse kasutada sünteesifaili.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"andmekandjat \"%s\" ei saa arvestada, sest selle nimekirjafaili kasutab juba "
-"muu andmekandja"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "pakette ei õnnestunud hankida, katkestatakse"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ei püüta kasutada sünteesi-\n"
+"                   või hdlist-faili.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - muu baasi kasutamine rpm-ide paigaldamisel.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s-st tehtud, aega jäänud (olet.) = %s, kiirus = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - loob automaatselt andmekandja distributsiooni\n"
+"                    osale XXX, kus XXX võib olla main, contrib, updates\n"
+"                    või mis tahes muu seadistatud määratlus ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "tõmmatud allika hdlisti (või sünteesi) MD5SUM arvutamine"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
+"                   on see %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "\"%s\" avaliku võtme faili import ebaõnnestus"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - kasutab määratud versiooni, vaikimisi on see\n"
+"                   paigaldatud paketi 'mandrake-release' versioon.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - kunagi ei paluta paketti eemaldada, paigaldusest "
-"loobuda.\n"
+"  --arch         - kasutab määratud arhitektuuri, vaikimisi on see\n"
+"                   paigaldatud paketi 'mandrake-release' arhitektuur.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq versioon %s\n"
-"Autoriõigus (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
+"  --virtual      - loob virtuaalse andmekandja, mis on alati värske,\n"
+"                   lubatud on ainult protokoll file://.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" allika hdlisti (või sünteesi) tõmbamine..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - näitab koos nimega ka gruppi.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - puhastab päistepuhvri kataloogi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "andmekandja \"%s\" ei ole valitud"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sunnib genereerima hdlist-faile.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Pakette võib paigaldada ainult administraator"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "cookeri distributsiooni uuenduste lisamine ebaõnnestus\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "spetsiifilise keskkonna kasutamine %s -l\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "peeglite tõmbamine asukohast %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ei leitud \"%s\" hdlist faili, andmekandjat eiratakse"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"võtme --distrib puhul puudub vajadus anda <suhteline tee hdlist juurde>"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - väikese tehingu pikkus, vaikimisi %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "andmekandja \"%s\" uuendamine ebaõnnestus\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - vasakpoolne sulg rühmaavaldise alustamiseks.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "Puudub <suhteline tee hdlist juurde>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "eemaldataval andmekandjal \"%s\" on liiga palju haakepunkte"
+msgid "`with' missing for network media\n"
+msgstr "võrguandmekandjal peab olema määratud `with'\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binaaroperaator AND: tõene, kui mõlemad avaldised on "
-"tõesed.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "andmekandja \"%s\" loomine ebaõnnestus\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"andmekandjat \"%s\" ei õnnestunud leida,\n"
-"mis võib juhtuda siis, kui andmekandjat luues ühendati kataloog käsitsi."
+"kasutamine: urpmi.removemedia [-a] <nimi> ...\n"
+"kus <nimi> on eemaldatava andmekandja nimi.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - näitab välja group: grupp.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - valib kõik andmekandjad.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - kasutatakse ainult määratud andmekandjaid (eraldajaks "
-"koma).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "tehingu loomine ebaõnnestus"
+"\n"
+"tundmatu võti '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm failide tõmbamine andmekandjalt \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ei ole midagi eemaldada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Valisite lähtekoodi paketi.\n"
-"\n"
-"%s\n"
-"\n"
-"On väheusutav, et Te tahate seda tõesti arvutile paigaldada (kui Te\n"
-"ei soovi just seda ise muuta ja uuesti kompileerida).\n"
-"\n"
-"Mida nüüd ette võtta?"
+"puudub eemaldatava kirje nimi\n"
+"(võimalikud: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s jaotamine"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"kasutamine: urpmi.update [võti] <nimi> ...\n"
+"kus <nimi> on uuendatava andmekandja nimi.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine ebaõnnestus"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - uuendab ainult uuendus-andmekandjat.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "seadistustefaili [%s] kirjutamine"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sunnib uuendama gpg võtit.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - valib kõik mitte-eemaldatavad andmekandjad.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - näitab välja epoch: epohh.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - kontrollib rpm signatuuri enne paigaldust\n"
-"                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
+"puudub uuendatava kirje nimi\n"
+"(võimalikud: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versioon %s\n"
+"Autoriõigus (C) 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun asetage andmekandja nimega \"%s\" seadmesse [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - näitab saadaolevaid pakette.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - loob uuendatava andmekandja.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - näitab saadaolevaid andmekandjaid.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - näitab saadaolevaid andmekandjaid URL-idega.\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - lubab ebatäpset otsingut (sama, mis --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "Ok"
-msgstr "Olgu"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - seadistusest tehakse tõmmis kujul urpmi.addmedia võti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "vigane hdlisti kirjeldus \"%s\" failis hdlists"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - näitab saadaolevaid sõlmi, kui kasutatakse võtit --"
+"parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "%s eemaldamine"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - näitab saadaolevaid aliaseid.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - loob automaatselt andmekandja distributsiooni\n"
-"                    osale XXX, kus XXX võib olla main, contrib, updates\n"
-"                    või mis tahes muu seadistatud määratlus ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - näitab välja size: suurus.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "säilitamaks %s"
+"  --headers      - pakettide päised loetakse urpmi andmebaasist "
+"standardväljundisse\n"
+"                   (ainult administraator).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "rahuldamata %s tõttu"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - näitab enne allalaadimist kõiki lähtetekstipakette "
+"(ainult administraator).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Automaatne pakettide paigaldamine...\n"
-"Soovisite paigaldada paketti %s\n"
+"  --use-distrib  - seadistab urpmi lennult distributsioonipuu põhjal.\n"
+"                   Võimaldab esitada päringu distributsiooni kohta.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi andmebaas on lukus"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - näitab muutuste logi.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - taasalustab osaliselt alla tõmmatud failide tõmbamist\n"
-"                   (--no-resume tühistab selle, vaikimisi on väljas).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - laiendab päringut paketi sõltuvustele.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" avaliku võtme faili uurimine..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - täielik väljund eemaldatavate pakettidega.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "eemaldatavat andmekandjat käsitletakse kui \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - kohandab otsingu sellele, mida pakett nõuab.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Kavatsete paigaldada oma arvutile järgmise tarkvarapaketi:\n"
-"\n"
-"%s\n"
-"\n"
-"Võib-olla soovite siiski seda lihtsalt salvestada? Mida ette võtta?"
+"  -i             - näitab kasulikku infot ka inimesele arusaadaval kujul.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - lubab ebatäpset otsingut (sama, mis -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - näitab koos nimega ka gruppi.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - eemaldab paketi, kui uuem versioon on juba paigaldatud.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - näitab koos nimega ka versiooni ja väljalaset.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - püütakse kasutada hdlist-faili.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - näitab faile paketis.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "puuduva %s tõttu"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  päringu esitamine käsureal antud nimede või rpm-failide kohta.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "võtit --list-nodes saab kasutada ainult koos võtmega --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"kasutamine: urpmi.update [võti] <nimi> ...\n"
-"kus <nimi> on uuendatava andmekandja nimi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "püütakse vältida olemasolevat andmekandjat \"%s\""
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s paigaldamiseks on vajalik üks järgnevatest pakettidest:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versioon %s\n"
+#~ "Autoriõigus (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+#~ "Litsentsi tingimustele.\n"
+#~ "\n"
+#~ "kasutamine:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Tundmatu veebitõmbaja '%s' !!!\n"
diff --git a/po/eu.po b/po/eu.po
index 878be71d..78ce83ca 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 22:21+0200\n"
 "Last-Translator: Iñigo Salvador Azurmend <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -37,890 +37,793 @@ msgstr "bByYsS"
 msgid "Nn"
 msgstr "eEnN"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s instalatzen\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - instalazio-euskarri batetik euskarri guztiak sortzen \n"
-"                   ditu automatikoki.\n"
+"Paketeen instalazio automatikoa...\n"
+"%s paketea instalatzea eskatu duzu\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "ezin da rpmdb ireki"
+msgid "Is this OK?"
+msgstr "Zuzena da?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
+msgid "Ok"
+msgstr "Ados"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Ondoko paketeetako bat behar da %s instalatzeko:"
+msgid "Cancel"
+msgstr "Utzi"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s paketea kentzen"
+msgid " (Y/n) "
+msgstr " (B/e) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: komandoa ez da aurkitu\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Modu paraleloa ezin da use-distrib moduarekin erabili "
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"erabilera: %s [aukerak]\n"
+"[aukerak] hemengoak dira\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Dena dago instalatuta"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - laguntza-mezu hau inprimatzen du.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - garbitu goiburuen cache direktorioa.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [taldea]     - emaitzak talde jakin batera murrizten ditu.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "%d prozesua erabiltzen transakzioa egiteko"
+msgid "                    defaults is %s.\n"
+msgstr "                    lehenetsia %s da.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - provides etiketa inprimatzen du: eskaintzen duen guztia.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s(e)rako protokolo ezezaguna definitu da"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Zein hautatzen duzu? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch ez da aurkitu, webfetch hauek onartzen dira: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d goiburu aurkitu dira cachean"
+msgid "unable to handle protocol: %s"
+msgstr "ezin da protokoloa maneiatu: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
+msgid "syntax error in config file at line %s"
+msgstr "sintaxi-errorea konfigurazio-fitxategiaren %s lerroan"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - zehaztu proxy-aren autentifikazioan erabiltzeko \n"
-"erabiltzailea eta pasahitza (formatua hau da: <erabiltzailea:pasahitza>).\n"
+"\"%s\" euskarria dagoeneko erabilita dagoen hdlist bat erabiltzen saiatzen "
+"ari da, euskarriari ez ikusi egingo zaio"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "mendekotasunak kontatzeko bigarren pasada egiten\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" euskarria dagoeneko erabilita dagoen zerrenda bat erabiltzen saiatzen "
+"ari da, euskarriari ez ikusi egingo zaio"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] rpm fitxategia berreskuratzen..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"ezin da \"%s\" euskarriaren ardura hartu, zerrenda-fitxategia beste euskarri "
+"batek erabili duelako"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ezin da izen gabeko euskarrirako \"%s\" izena erabili, dagoeneko erabilita "
+"dagoelako"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...berreskuratzeak huts egin du: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"ezin da \"%s\" euskarria aintzat hartu, [%s] zerrenda-fitxategia existitzen "
+"ez delako"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia aztertu, euskarriari ez ikusi egin "
-"zaio"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ezin da hdlist fitxategi honen [%s] euskarria zehaztu"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - EDO eragile bitarra, egia adierazpen bat egia bada.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ezin da \"%s\"(r)en hdlist fitxategia atzitu, euskarriari jaramonik ez"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Paketearen instalazioa..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia atzitu, euskarriari ez ikusi egingo "
+"zaio"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "rpm fitxategi-izen baliogabea [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "lehendik dagoen \"%s\" euskarria saltatzeko ahalegina, ekiditen"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "proxy-adierazpen okerra komando-lerroan\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"\"%s\" euskarri birtualak ez luke hdlist edo fitxategi-zerrenda zehaztuta "
+"eduki beharko, euskarriari ez ikusi egingo zaio"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalazio-transakzioek huts egin dute"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
-"ezin da lehen instalazio-euskarria atzitu (ez da Mandrake/base/hdlists "
-"fitxategia aurkitu)"
+"ezin da \"%s\"(r)en hdlist fitxategia aurkitu, euskarriari ez ikusi egin zaio"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aukera okerra, saiatu berriro\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu, euskarriari ez ikusi egin "
+"zaio"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\" euskarriaren zerrenda-fitxategia inkoherentea da, euskarriari ez "
+"ikusi egin zaio"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - summary etiketa inprimatzen du: laburpena.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"ezin da \"%s\"(r)en zerrenda-fitxategia aztertu, euskarriari ez ikusi egin "
+"zaio"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ondoko paketeek %s dute: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instalatu"
+msgid "taking removable device as \"%s\""
+msgstr "gailu aldagarria \"%s\" gisa hartzen"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X interfazea erabiltzen du.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ondoko paketeetako bat behar da:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak kendu egingo "
-"dira (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - aukeratu interfazerik onena ingurunearen arabera:\n"
-"                   X edo testu-modua.\n"
+msgid "write config file [%s]"
+msgstr "[%s] konfigurazio-fitxategia idatzi"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "`%s' paketea deskargatzen..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Modu paraleloa ezin da use-distrib moduarekin erabili "
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Zer egin daiteke rpm fitxategi binarioekin --install-src erabiltzean"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
-"hautatzen ditu\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "[%s] fitxategiko maneiatzaile paraleloa aztertzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "ez dago %s izeneko paketerik"
+msgid "found parallel handler for nodes: %s"
+msgstr "nodoentzako maneiatzaile paraleloa aurkitu da: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "modu paralelorako asoziatutako euskarria erabiltzen: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Huts egin du instalatzean, fitxategi batzuk falta dira:\n"
-"%s\n"
-"Zure urpmi datu-basea eguneratzea komeni da"
+msgid "unable to use parallel option \"%s\""
+msgstr "ezin da \"%s\" aukera paraleloa erabili"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Erabilera: urpmi.removemedia [-a] <izena> ...\n"
-"non <izena> kendu beharreko euskarri-izena den.\n"
+"--laburpena ezin da hauekin erabili: --media, --excludemedia, --sortmedia, --"
+"update edo -parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Ezin da instalazioarekin jarraitu, honako paketeak\n"
-"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "[%s] laburpen-fitxategia aztertzen"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "sareko euskarriaren `with' falta da\n"
+msgid "examining hdlist file [%s]"
+msgstr "[%s] hdlist fitxategia aztertzen"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - paketeko fitxategiak zerrendatzen ditu.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "\"%s\" euskarri birtuala ez da lokala, ez ikusi egingo zaio"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pakete ezezaguna"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "arazoa \"%s\" euskarriaren hdlist edo laburpen-fitxategia irakurtzean"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalazioa posible da"
+msgid "performing second pass to compute dependencies\n"
+msgstr "mendekotasunak kontatzeko bigarren pasada egiten\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "%s paketea saltatzen"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"ezin da \"%s\" euskarria aintzat hartu, [%s] zerrenda-fitxategia existitzen "
-"ez delako"
+msgid "unable to open rpmdb"
+msgstr "ezin da rpmdb ireki"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (b/E) "
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" euskarria lehendik badago"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ezin dira cooker banaketa baten eguneratzeak gehitu\n"
+msgid "virtual medium need to be local"
+msgstr "euskarri birtualak lokala izan behar du"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modu xehatua.\n"
+msgid "added medium %s"
+msgstr "%s euskarria gehitu da"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Berrabiarazten..."
+msgid "unable to access first installation medium"
+msgstr "ezin da lehen instalazio-euskarria atzitu"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - pakete erabilgarrien zerrenda.\n"
+msgid "copying hdlists file..."
+msgstr "hdlists fitxategia kopiatzen..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all - etiketa guztiak inprimatzen ditu.\n"
+msgid "...copying failed"
+msgstr "...ezin izan da kopiatu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"\"%s\" euskarri inkoherentea aldagarri gisa markatuta dago, baina ez da"
+msgid "...copying done"
+msgstr "...kopiatzea burutu da"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"\"%s\" euskarri birtualak ez luke hdlist edo fitxategi-zerrenda zehaztuta "
-"eduki beharko, euskarriari ez ikusi egingo zaio"
+"ezin da lehen instalazio-euskarria atzitu (ez da Mandrake/base/hdlists "
+"fitxategia aurkitu)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "kopiatutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
+msgid "retrieving hdlists file..."
+msgstr "hdlist fitxategia berreskuratzen..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - kanpoan uzten du komaz bereizitako bide-izena.\n"
+msgid "...retrieving done"
+msgstr "...berreskuratu da"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Prest zaudenean sakatu Sartu..."
+msgid "...retrieving failed: %s"
+msgstr "...berreskuratzeak huts egin du: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"aukera ezezagunak '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlist azalpen baliogabea \"%s\" hdlists fitxategian"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - transakzio txikiagoetan zatitzen du adierazitako "
-"paketeak\n"
-"                   baino gehiago instalatu edo bertsio-berrituko badira,\n"
-"                   lehenetsia %d da.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "arazoa \"%s\" euskarriaren hdlist edo laburpen-fitxategia irakurtzean"
+msgid "selecting multiple media: %s"
+msgstr "hainbat euskarri hautatzen: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
+msgid "removing medium \"%s\""
+msgstr "\"%s\" euskarria kentzen"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - --parallel erabiltzean erabilgarri dauden nodoen "
-"zerrenda .\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] hdlist eraikitzen"
+"ezin da \"%s\" euskarria atzitu,\n"
+"agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - gorde lehendik dauden paketeak ahal bada, ezetsi kentzea\n"
-"                   eragiten duten pakete-eskaerak.\n"
+"\"%s\" euskarri birtualak baliozko hdlist edo fitxategi-zerrenda eduki "
+"beharko luke, ez ikusi egingo zaio"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM fitxategia aztertzen"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komandoa ez da aurkitu\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "ezin da rpm fitxategia erregistratu"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM fitxategia aztertzen"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
-"ematen du, mendekotasunak egiaztatu gabe.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\"(r)en hdlist iturburua (edo laburpena) kopiatzen..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ezin da protokoloa maneiatu: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlist fitxategia berreskuratzen..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "kopiatutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Bai, instalatu nahi dut"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "ezin izan da [%s] kopiatu (md5sum ez dator bat)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "%s euskarria gehitu da"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - erabili gabeko rpm cachean gordetzen du.\n"
+msgid "reading rpm files from [%s]"
+msgstr "[%s](e)ko rpm fitxategiak irakurtzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
-"d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ezin izan da [%s](e)ko rpm fitxategirik irakurri: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum ez dator bat"
+msgid "no rpm files found from [%s]"
+msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaxi-errorea konfigurazio-fitxategiaren %s lerroan"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\"(r)en iturburuko hdlist (edo laburpena) berreskuratzen..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "probatutako hdlist (edo laburpena) aurkitu da %s gisa"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"  --proxy        - HTTP proxy espezifikoa erabiltzen du, ataka-zenbakiak \n"
-"                   1080 izan behar du lehenespenez (formatua hau da: \n"
-"<proxy-ostalaria[:ataka]>).\n"
+"berreskuratutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "%s instalatzeko"
+msgid "md5sum mismatch"
+msgstr "md5sum ez dator bat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s sarrera depslist-en birkokatuta"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "ezin izan da hdlist iturburua (edo laburpena) berreskuratu"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ez bereizi maiuskulak eta minuskulak ereduetan.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "[%s] fitxategia lehendik erabili da \"%s\" euskarri berean"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "%s(e)ko ispiluak berreskuratzen..."
+msgid "unable to write list file of \"%s\""
+msgstr "ezin da \"%s\"(r)en zerrenda-fitxategia idatzi"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - url etiketa inprimatzen du: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s(e)rako protokolo ezezaguna definitu da"
+msgid "nothing written in list file for \"%s\""
+msgstr "ez dago ezer idatzita \"%s\"(r)en zerrenda-fitxategian"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
-"  -r             - bertsioa eta argitalpena ere izenarekin inprimatzen "
-"ditu.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - obsoletes etiketa inprimatzen du: zaharkitu guztiak.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" euskarria lehendik badago"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "%s instalatzen\n"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" euskarritik goiburuak irakurtzen"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"eguneratu beharreko sarrera falta da\n"
-"(%s(e)tako bat\n"
+msgid "building hdlist [%s]"
+msgstr "[%s] hdlist eraikitzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "%s jaso nahian"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ezin da %s paketea kendu"
+msgid "found %d headers in cache"
+msgstr "%d goiburu aurkitu dira cachean"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
+msgid "removing %d obsolete headers in cache"
+msgstr "%d goiburu zaharkituak cachetik ezabatzen"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"kendu beharreko sarrera falta da\n"
-"(%s(e)tako bat\n"
+msgid "mounting %s"
+msgstr "%s muntatzen"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
+msgid "unmounting %s"
+msgstr "%s desmuntatzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Sinadura falta da (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "%s sarrera depslist-en birkokatuta"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ezin izan da [%s](e)ko rpm fitxategirik irakurri: %s"
+msgid "no entries relocated in depslist"
+msgstr "ez dago birkokatutako sarrerarik depslist-en"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "rpm fitxategi-izen baliogabea [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "[%s] rpm fitxategia berreskuratzen..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - eguneratze-euskarria bakarrik eguneratzen du.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "ezin izan da rpm fitxategia atzitu [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (B/e) "
+msgid "unable to register rpm file"
+msgstr "ezin da rpm fitxategia erregistratu"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [taldea]     - emaitzak talde jakin batera murrizten ditu.\n"
+msgid "error registering local packages"
+msgstr "errorea pakete lokalak erregistratzean"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"\"%s\" euskarria dagoeneko erabilita dagoen zerrenda bat erabiltzen saiatzen "
-"ari da, euskarriari ez ikusi egingo zaio"
+msgid "no package named %s"
+msgstr "ez dago %s izeneko paketerik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "sarrera gaizki osatuta: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Ondoko paketeek %s dute: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - euskarri erabilgarrien zerrenda.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ezin da [%s] \"%s\" balioan ondo analizatu"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Eskatutako pakete bat ezin da instalatu:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' paketea instalatzen (%s/%s)..."
+"\"%s\" euskarriak zerrenda-fitxategi balio gabea erabiltzen du:\n"
+"  baliteke ispilua eguneratu gabe egotea, ordezko metodoa erabiliko da"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ez dago birkokatutako sarrerarik depslist-en"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "\"%s\" euskarriak ez du rpm fitxategientzako kokalekurik definitzen"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
+msgid "package %s is not found."
+msgstr "ez da %s paketea aurkitu."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgid "urpmi database locked"
+msgstr "urpmi datu-basea blokeatuta"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" euskarria ez dago hautatuta"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "ados zaude ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ezin izan dugu [%s] rpm fitxategia \"%s\" euskarrian irakurri"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
-"\"%s\" euskarriaren zerrenda-fitxategia inkoherentea da, euskarriari ez "
-"ikusi egin zaio"
+"\"%s\" euskarri inkoherentea aldagarri gisa markatuta dago, baina ez da"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...berreskuratu da"
+msgid "unable to access medium \"%s\""
+msgstr "ezin izan dugu \"%s\" euskarria atzitu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s paketea gehitzen (id=%d, eid=%d, eguneratzea=%d, fitxategia=%s)"
+msgid "malformed input: [%s]"
+msgstr "sarrera gaizki osatuta: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "%s paketea saltatzen"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Sinadura ez da baliozkoa (%s)"
+msgid "Preparing..."
+msgstr "Prestatzen..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
+msgid "using process %d for executing transaction"
+msgstr "%d prozesua erabiltzen transakzioa egiteko"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi %s bertsioa\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
-"betetzen badira.\n"
-"\n"
-"erabilera:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ezin da [%s] \"%s\" balioan ondo analizatu"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ezin da hdlist fitxategi honen [%s] euskarria zehaztu"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
+"transakzioa sortu da %s(e)n instalatzeko (kendu=%d, instalatu=%d,eguneratu=%"
+"d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"\"%s\" euskarria dagoeneko erabilita dagoen hdlist bat erabiltzen saiatzen "
-"ari da, euskarriari ez ikusi egingo zaio"
+msgid "unable to create transaction"
+msgstr "ezin da transakziorik sortu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "%s(r)ekin gatazkak daudelako"
+msgid "removing package %s"
+msgstr "%s paketea kentzen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "%d goiburu zaharkituak cachetik ezabatzen"
+msgid "unable to remove package %s"
+msgstr "ezin da %s paketea kendu"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ezin da \"%s\" euskarria eguneratu\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s paketea gehitzen (id=%d, eid=%d, eguneratzea=%d, fitxategia=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
+msgid "unable to install package %s"
+msgstr "ezin da %s paketea instalatu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "\"%s\" euskarri birtuala ez da lokala, ez ikusi egingo zaio"
+msgid "due to missing %s"
+msgstr "%s falta delako"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Prestatzen..."
+msgid "due to unsatisfied %s"
+msgstr "%s bete gabe dagoelako"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    lehenetsia %s da.\n"
+msgid "trying to promote %s"
+msgstr "%s jaso nahian"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
+msgid "in order to keep %s"
+msgstr "%s gordetzeko"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ez saiatu laburpenik edo hdlist "
-"fitxategirik                   bilatzen\n"
+msgid "in order to install %s"
+msgstr "%s instalatzeko"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
+msgid "due to conflicts with %s"
+msgstr "%s(r)ekin gatazkak daudelako"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "ezin izan da [%s] kopiatu (md5sum ez dator bat)"
+msgid "unrequested"
+msgstr "ez da eskatu"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik.\n"
-"                   Horren bidez distro bati kontsulta egin diezaiokezu.\n"
+msgid "Invalid signature (%s)"
+msgstr "Sinadura ez da baliozkoa (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"erabilera: %s [aukerak]\n"
-"[aukerak] hemengoak dira\n"
+msgid "Invalid Key ID (%s)"
+msgstr "ID gakoa ez da baliozkoa (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - kendu rpm cachetik beste ezer baino lehen.\n"
+msgid "Missing signature (%s)"
+msgstr "Sinadura falta da (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ezin da izen gabeko euskarrirako \"%s\" izena erabili, dagoeneko erabilita "
-"dagoelako"
+msgid "bad proxy declaration on command line\n"
+msgstr "proxy-adierazpen okerra komando-lerroan\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts    - conflicts etiketa inprimatzen du: gatazka guztiak.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"\"%s\" euskarri birtualak baliozko hdlist edo fitxategi-zerrenda eduki "
-"beharko luke, ez ikusi egingo zaio"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aukera okerra, saiatu berriro\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -937,1115 +840,1258 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"Erabilera: urpmi.addmedia [aukerak] <izena> <url> [with <bide-"
-"izen_erlatiboa>] \n"
-"non <url> hauetako bat den\n"
-"       fitxategia://<bide-izena>\n"
-"       ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena> with "
-"<hdlist-en fitxategi-izen erlatiboa>\n"
-"       ftp://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-"       http://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-"       aldagarria://<bide-izena>\n"
-"\n"
-"eta [aukerak] hemengoak dira\n"
+"  --test         - instalazioa behar bezala egin daitekeen egiaztatzen du.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\"(r)en hdlist iturburua (edo laburpena) kopiatzen..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiatzea burutu da"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ezin da \"%s\" aukera paraleloa erabili"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"\"%s\" euskarriak zerrenda-fitxategi balio gabea erabiltzen du:\n"
-"  baliteke ispilua eguneratu gabe egotea, ordezko metodoa erabiliko da"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access first installation medium"
-msgstr "ezin da lehen instalazio-euskarria atzitu"
+"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
+"                   erabilgarria chroot --root aukerarekin (des)"
+"instalatzeko.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "euskarri birtualak lokala izan behar du"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modu xehatua.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "error registering local packages"
-msgstr "errorea pakete lokalak erregistratzean"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
+"kontuan hartuz.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - deskarga-abiadura mugatzen du.\n"
+msgid "unknown packages"
+msgstr "pakete ezezagunak"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "probatutako hdlist (edo laburpena) aurkitu da %s gisa"
+msgid "unknown package"
+msgstr "pakete ezezaguna"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "ezin izan da hdlist iturburua (edo laburpena) berreskuratu"
+msgid "removing package %s will break your system"
+msgstr "%s paketea kentzen baduzu, sistema apurtuko duzu"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
+msgid "Nothing to remove"
+msgstr "Ez dago ezer kentzeko"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ez dago ezer idatzita \"%s\"(r)en zerrenda-fitxategian"
+msgid "Checking to remove the following packages"
+msgstr "Ondoko paketeak kentzeko egiaztatzen"
 
-#: ../urpmi:1
+#: ../urpme:106
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Ondoko pakete hauek sinadura okerra dute"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak kendu egingo "
+"dira (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
+msgid " (y/N) "
+msgstr " (b/E) "
 
-#: ../urpmq:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - osatu irteera kendu behar den paketearekin.\n"
+msgid "removing %s"
+msgstr "%s kentzen"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "unable to install package %s"
-msgstr "ezin da %s paketea instalatu"
+msgid "Removing failed"
+msgstr "Kentzean huts egin du"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
-"ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
+"urpmf %s bertsioa\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
+"betetzen badira.\n"
+"\n"
+"erabilera:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Gorde fitxategia"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - emandako euskarria bakarrik erabiltzen du, komaz "
+"bereizita.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ez erabili adierazitako euskarria, komaz bereizita.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
-"kontuan hartuz.\n"
+"  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
+"ordenatzen ditu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID gakoa ez da baliozkoa (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modu xehatua.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - deitzea behartzen du, nahiz eta pakete batzuk ez egon.\n"
+"--quiet - ez du 'name' etiketa inprimatzen (lehenetsia da komando-lerroan "
+"etiketarik ez badago, modu interaktiboarekin bateraezina).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
-"da.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all - etiketa guztiak inprimatzen ditu.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - group etiketa inprimatzen du: taldea.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - 'size' etiketa inprimatzen du: tamaina.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist bide-izen erlatiboa> falta da\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - epoch etiketa inprimatzen du: aroa.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ondoko paketeak kentzeko egiaztatzen"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - summary etiketa inprimatzen du: laburpena.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "ez da eskatu"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description - description inprimatzen du: azalpena.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ezin izan da rpm fitxategia atzitu [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - sourcerpm etiketa inprimatzen du: iturburuko rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - files etiketa inprimatzen du: fitxategi guztiak.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - packager etiketa inprimatzen du: paketatzailea.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - buildhost etiketa inprimatzen du: zein makinatan eraiki "
+"den.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Instalatzen jarraitu nahi duzu?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - url etiketa inprimatzen du: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ezin izan dugu [%s] rpm fitxategia \"%s\" euskarrian irakurri"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - provides etiketa inprimatzen du: eskaintzen duen guztia.\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
-"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
-"                   erabilgarria chroot --root aukerarekin instalatzeko.\n"
+"  --requires     - requires etiketa inprimatzen du: eskatzen duen guztia.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - files etiketa inprimatzen du: fitxategi guztiak.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
-"  -i     - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
-"du.\n"
+"  --conflicts    - conflicts etiketa inprimatzen du: gatazka guztiak.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes    - obsoletes etiketa inprimatzen du: zaharkitu guztiak.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - banaketa-bertsio espezifikoa erabiltzen du, lehenetsia\n"
-"                   instalatutako mandrake-release paketean jartzen "
-"duen                   bertsiotik hartutakoa da.\n"
+"  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
+"                   errorearen berri ematea).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ez bereizi maiuskulak eta minuskulak ereduetan.\n"
+
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
+"ditu.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - ispiluen zerrendaren url espezifikoa erabiltzen du,\n"
-"                   lehenetsia %s da\n"
+"  -a             - ETA eragile bitarra, egia bi adierazpenak egia badira.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
-"                   erabilgarria chroot --root aukerarekin (des)"
-"instalatzeko.\n"
+"  -o             - EDO eragile bitarra, egia adierazpen bat egia bada.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - EZ unarioa, egia adierazpena faltsua bada.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - ezkerreko parentesia taldeko adierazpena irekitzeko.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - eskuineko parentesia taldeko adierazpena ixteko.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
-"emateko edo ezabatu"
+"atzeradeia hau da :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s desmuntatzen"
+msgid "using specific environment on %s\n"
+msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% eginda, abiadura = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi %s bertsioa\n"
+"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
+"betetzen badira.\n"
+"\n"
+"erabilera:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi berrabiarazten"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "[%s] laburpen-fitxategia aztertzen"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
+"hautatzen ditu\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Areago instalatzen saiatu (--force)? (b/E) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - inoiz ez du pakete bat desinstalatu nahi den galdetzen, "
+"instalazioa bertan behera uzten da.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...ezin izan da kopiatu"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - gorde lehendik dauden paketeak ahal bada, ezetsi kentzea\n"
+"                   eragiten duten pakete-eskaerak.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ezin da \"%s\"(r)en hdlist fitxategia atzitu, euskarriari jaramonik ez"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - transakzio txikiagoetan zatitzen du adierazitako "
+"paketeak\n"
+"                   baino gehiago instalatu edo bertsio-berrituko badira,\n"
+"                   lehenetsia %d da.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modu lasaia.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modu xehatua.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
-" (root-ek bakarrik).\n"
+"  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - zerrendatutako paketeen goiburuak urpmi db-tik atera\n"
-"                   eta stdout-era eramaten ditu (root-ek bakarrik).\n"
+"  --install-src  - iturburu-paketea bakarrik instalatzen du (binarioak ez).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pakete ezezagunak"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - kendu rpm cachetik beste ezer baino lehen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "hainbat euskarri hautatzen: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - erabili gabeko rpm cachean gordetzen du.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
-"ditu.\n"
+"  --allow-nodeps - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
+"ematen du, mendekotasunak egiaztatu gabe.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "[%s] fitxategia lehendik erabili da \"%s\" euskarri berean"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
+"ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
+"                   erabilgarria chroot --root aukerarekin instalatzeko.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu, euskarriari ez ikusi egin "
-"zaio"
+"  --wget         - wget erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - laguntza-mezu hau inprimatzen du.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nodoentzako maneiatzaile paraleloa aurkitu da: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - deskarga-abiadura mugatzen du.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"atzeradeia hau da :\n"
-"%s\n"
+"  --resume  - partzialki deskargatutako fitxategien transferentziari "
+"berriro\n"
+"ekiten dio ('--no-resume'-k hori desgaitzen du; lehenetsia desgaituta da).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - paketeak behar duenaren alderantzizko bilaketa.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - HTTP proxy espezifikoa erabiltzen du, ataka-zenbakiak \n"
+"                   1080 izan behar du lehenespenez (formatua hau da: \n"
+"<proxy-ostalaria[:ataka]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf %s bertsioa\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
-"betetzen badira.\n"
-"\n"
-"erabilera:\n"
+"  --proxy-user   - zehaztu proxy-aren autentifikazioan erabiltzeko \n"
+"erabiltzailea eta pasahitza (formatua hau da: <erabiltzailea:pasahitza>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"--quiet - ez du 'name' etiketa inprimatzen (lehenetsia da komando-lerroan "
-"etiketarik ez badago, modu interaktiboarekin bateraezina).\n"
+"  --bug          - errorearen berri ematea bideratzen du, hurrengo "
+"argumentuak\n"
+"                   adierazitako direktorioan.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X interfazea erabiltzen du.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--laburpena ezin da hauekin erabili: --media, --excludemedia, --sortmedia, --"
-"update edo -parallel"
+"  --best-output  - aukeratu interfazerik onena ingurunearen arabera:\n"
+"                   X edo testu-modua.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - zehaztutako arkitektura erabiltzen du, lehenetsia\n"
-"                   instalatutako mandrake-release paketearen arkitektura "
-"da.\n"
+"  --verify-rpm   - instalatu aurretik rpm sinadura egiaztatzen du\n"
+"                   (--no-verify-rpm desgaitzen du, lehenetsia gaituta "
+"dago).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Zuzena da?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - kanpoan uzten du komaz bereizitako bide-izena.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - docs fitxategiak kanpoan uzten ditu.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "[%s] fitxategiko maneiatzaile paraleloa aztertzen"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p     - paketeak aurkitzeko bilaketa 'provides'en egitea baimentzen du.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ez dago ezer kentzeko"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" euskarritik goiburuak irakurtzen"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - kontsulta paketeen mendekoetara zabaltzen du.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modu lasaia.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - errorearen berri ematea bideratzen du, hurrengo "
-"argumentuak\n"
-"                   adierazitako direktorioan.\n"
+"  komando-lerroan idatzitako izenak edo rpm fitxategiak instalatuko dira.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "\"%s\" euskarriak ez du rpm fitxategientzako kokalekurik definitzen"
+msgid "Choose location to save file"
+msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - sourcerpm etiketa inprimatzen du: iturburuko rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Zer egin daiteke rpm fitxategi binarioekin --install-src erabiltzean"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ezin da \"%s\"(r)en zerrenda-fitxategia idatzi"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Iturburu-pakete bat hautatu duzu:\n"
+"\n"
+"%s\n"
+"\n"
+"Segur aski ez zenuen ordenagailuan instalatu nahi(instalatzen baduzu\n"
+"bere iturburu-kodean aldaketak egin eta gero konpilatu egingo litzateke).\n"
+"\n"
+"Zer egin nahi duzu?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr ""
-"  --requires     - requires etiketa inprimatzen du: eskatzen duen guztia.\n"
+msgid "Do nothing"
+msgstr "Ez egin ezer"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
+msgid "Yes, really install it"
+msgstr "Bai, instalatu nahi dut"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description - description inprimatzen du: azalpena.\n"
+msgid "Save file"
+msgstr "Gorde fitxategia"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Ezin izan da kopiatu"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Software-pakete hau instalatzera zoaz ordenagailuan:\n"
+"\n"
+"%s\n"
+"\n"
+"Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist fitxategiak sortzera behartzen du.\n"
+msgid "Install it"
+msgstr "Instalatu"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"[%s] direktorioa badago lehendik, erabili beste direktorio bat akatsen berri "
+"emateko edo ezabatu"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Ezin da erroreen berri emateko [%s] direktorioa sortu"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
+msgid "Copying failed"
+msgstr "Ezin izan da kopiatu"
 
-# zy, c-format
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "%s instalatzen"
+msgid "Only superuser is allowed to install packages"
+msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s](e)ko rpm fitxategiak irakurtzen"
+msgid "One of the following packages is needed:"
+msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
+msgid "What is your choice? (1-%d) "
+msgstr "Zein hautatzen duzu? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
+msgid "Package installation..."
+msgstr "Paketearen instalazioa..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Kentzean huts egin du"
+msgid "Initializing..."
+msgstr "Berrabiarazten..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - beti eguneratuta dauden euskarri birtualak sortzen ditu,\n"
-"                   file:// protokoloa bakarrik onartzen da.\n"
+"Eskatutako pakete bat ezin da instalatu:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "ez da %s paketea aurkitu."
+msgid "do you agree ?"
+msgstr "ados zaude ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" euskarria kentzen"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Ezin da instalazioarekin jarraitu, honako paketeak\n"
+"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
+"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
+"%s"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
-msgstr "Utzi"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira (%d MB)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --src          - hurrengo paketea iturburu-pakete bat da (-s bezala).\n"
+"Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
-"                   errorearen berri ematea).\n"
+msgid "unable to get source packages, aborting"
+msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
-"ordenatzen ditu.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ezin izan dugu \"%s\" euskarria atzitu"
+msgid "Press Enter when ready..."
+msgstr "Prest zaudenean sakatu Sartu..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ezin da \"%s\" euskarria sortu\n"
+msgid "Downloading package `%s'..."
+msgstr "`%s' paketea deskargatzen..."
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - packager etiketa inprimatzen du: paketatzailea.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s eginda, ETA = %s, abiadura = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% eginda, abiadura = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Ondoko pakete hauek sinadura okerra dute"
 
-#: ../urpmi:1
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Instalatzen jarraitu nahi duzu?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
+"Huts egin du instalatzean, fitxategi batzuk falta dira:\n"
 "%s\n"
+"Zure urpmi datu-basea eguneratzea komeni da"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - changelog inprimatzen du.\n"
+msgid "Installation failed"
+msgstr "Instalazioak huts egin du"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"ezin da \"%s\"(r)en zerrenda-fitxategia atzitu, euskarriari ez ikusi egingo "
-"zaio"
+msgid "distributing %s"
+msgstr "%s banatzen"
 
-#: ../urpmf:1
+# zy, c-format
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - eskuineko parentesia taldeko adierazpena ixteko.\n"
+msgid "installing %s"
+msgstr "%s instalatzen"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch ez da aurkitu, webfetch hauek onartzen dira: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "[%s] hdlist fitxategia aztertzen"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlists fitxategia kopiatzen..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Areago instalatzen saiatu (--force)? (b/E) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
+msgid "%d installation transactions failed"
+msgstr "%d instalazio-transakzioek huts egin dute"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
+msgid "Installation is possible"
+msgstr "Instalazioa posible da"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr ""
-"  --buildhost    - buildhost etiketa inprimatzen du: zein makinatan eraiki "
-"den.\n"
+msgid "Everything already installed"
+msgstr "Dena dago instalatuta"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Ez egin ezer"
+msgid "restarting urpmi"
+msgstr "urpmi berrabiarazten"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"Erabilera: urpmi.addmedia [aukerak] <izena> <url> [with <bide-"
+"izen_erlatiboa>] \n"
+"non <url> hauetako bat den\n"
+"       fitxategia://<bide-izena>\n"
+"       ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena> with "
+"<hdlist-en fitxategi-izen erlatiboa>\n"
+"       ftp://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
+"erlatiboa>\n"
+"       http://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
+"erlatiboa>\n"
+"       aldagarria://<bide-izena>\n"
+"\n"
+"eta [aukerak] hemengoak dira\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "modu paralelorako asoziatutako euskarria erabiltzen: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s muntatzen"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - laburpen-fitxategia bilatzen eta erabiltzen saiatzen "
+"da.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
-"ezin da \"%s\" euskarriaren ardura hartu, zerrenda-fitxategia beste euskarri "
-"batek erabili duelako"
+"  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ez saiatu laburpenik edo hdlist "
+"fitxategirik                   bilatzen\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - beste root bat erabiltzen du rpm instalatzeko.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - instalazio-euskarri batetik euskarri guztiak sortzen \n"
+"                   ditu automatikoki.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s eginda, ETA = %s, abiadura = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - banaketa baten XXX zatiaren euskarria sortzen du \n"
+"                   automatikoki. XXX main, contrib, updates edo\n"
+"                   konfiguratu den beste edozer izan daiteke ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"berreskuratutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
+"  --from         - ispiluen zerrendaren url espezifikoa erabiltzen du,\n"
+"                   lehenetsia %s da\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - banaketa-bertsio espezifikoa erabiltzen du, lehenetsia\n"
+"                   instalatutako mandrake-release paketean jartzen "
+"duen                   bertsiotik hartutakoa da.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - inoiz ez du pakete bat desinstalatu nahi den galdetzen, "
-"instalazioa bertan behera uzten da.\n"
+"  --arch         - zehaztutako arkitektura erabiltzen du, lehenetsia\n"
+"                   instalatutako mandrake-release paketearen arkitektura "
+"da.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq %s bertsioa\n"
-"Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
-"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
-"betetzen badira.\n"
-"\n"
-"erabilera:\n"
+"  --virtual      - beti eguneratuta dauden euskarri birtualak sortzen ditu,\n"
+"                   file:// protokoloa bakarrik onartzen da.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\"(r)en iturburuko hdlist (edo laburpena) berreskuratzen..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - garbitu goiburuen cache direktorioa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" euskarria ez dago hautatuta"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist fitxategiak sortzera behartzen du.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ezin dira cooker banaketa baten eguneratzeak gehitu\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "%s(e)ko ispiluak berreskuratzen..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
-"ezin da \"%s\"(r)en hdlist fitxategia aurkitu, euskarriari ez ikusi egin zaio"
+"ez dago <hdlist-en bide-izen erlatiboa> --distrib erabiliz eman beharrik"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ezin da \"%s\" euskarria eguneratu\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - ezkerreko parentesia taldeko adierazpena irekitzeko.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist bide-izen erlatiboa> falta da\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
+msgid "`with' missing for network media\n"
+msgstr "sareko euskarriaren `with' falta da\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - ETA eragile bitarra, egia bi adierazpenak egia badira.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "ezin da \"%s\" euskarria sortu\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"ezin da \"%s\" euskarria atzitu,\n"
-"agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
+"Erabilera: urpmi.removemedia [-a] <izena> ...\n"
+"non <izena> kendu beharreko euskarri-izena den.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - group etiketa inprimatzen du: taldea.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - euskarri guztiak hautatzen ditu.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - emandako euskarria bakarrik erabiltzen du, komaz "
-"bereizita.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "ezin da transakziorik sortu"
+"\n"
+"aukera ezezagunak '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm fitxategiak berreskuratzen \"%s\" euskarritik..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ez dago kentzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Iturburu-pakete bat hautatu duzu:\n"
-"\n"
-"%s\n"
-"\n"
-"Segur aski ez zenuen ordenagailuan instalatu nahi(instalatzen baduzu\n"
-"bere iturburu-kodean aldaketak egin eta gero konpilatu egingo litzateke).\n"
-"\n"
-"Zer egin nahi duzu?"
+"kendu beharreko sarrera falta da\n"
+"(%s(e)tako bat\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s banatzen"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Erabilera: urpmi.update [aukerak] <izena> ...\n"
+"non <izena> eguneratu beharreko euskarri-izena den.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Instalazioak huts egin du"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - eguneratze-euskarria bakarrik eguneratzen du.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "[%s] konfigurazio-fitxategia idatzi"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg gakoa eguneratzera behartzen du.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - epoch etiketa inprimatzen du: aroa.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - instalatu aurretik rpm sinadura egiaztatzen du\n"
-"                   (--no-verify-rpm desgaitzen du, lehenetsia gaituta "
-"dago).\n"
+"eguneratu beharreko sarrera falta da\n"
+"(%s(e)tako bat\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf %s bertsioa\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
+"betetzen badira.\n"
+"\n"
+"erabilera:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - pakete erabilgarrien zerrenda.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - euskarri erabilgarrien zerrenda.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url  - erabilgarri dauden euskarriak eta haien url-a zerrendatzen "
 "ditu.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - config urpmi.addmedia argumentu gisa iraultzen du.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ados"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - --parallel erabiltzean erabilgarri dauden nodoen "
+"zerrenda .\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlist azalpen baliogabea \"%s\" hdlists fitxategian"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - alias paralelo erabilgarrien zerrenda.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "%s kentzen"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - zerrendatutako paketeen goiburuak urpmi db-tik atera\n"
+"                   eta stdout-era eramaten ditu (root-ek bakarrik).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - banaketa baten XXX zatiaren euskarria sortzen du \n"
-"                   automatikoki. XXX main, contrib, updates edo\n"
-"                   konfiguratu den beste edozer izan daiteke ;-)\n"
+"--sources - iturburu-pakete guztiak deskargatu aurretik ematen ditu \n"
+" (root-ek bakarrik).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - 'size' etiketa inprimatzen du: tamaina.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - urpmi berehala konfiguratzen du distrib zuhaitzetik.\n"
+"                   Horren bidez distro bati kontsulta egin diezaiokezu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "%s gordetzeko"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - changelog inprimatzen du.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s bete gabe dagoelako"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - kontsulta paketeen mendekoetara zabaltzen du.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Paketeen instalazio automatikoa...\n"
-"%s paketea instalatzea eskatu duzu\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi datu-basea blokeatuta"
+"-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume  - partzialki deskargatutako fitxategien transferentziari "
-"berriro\n"
-"ekiten dio ('--no-resume'-k hori desgaitzen du; lehenetsia desgaituta da).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - osatu irteera kendu behar den paketearekin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - paketeak behar duenaren alderantzizko bilaketa.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i     - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
+"du.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gailu aldagarria \"%s\" gisa hartzen"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - taldeak ere izenarekin inprimatzen ditu.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
-"Software-pakete hau instalatzera zoaz ordenagailuan:\n"
-"\n"
-"%s\n"
-"\n"
-"Baliteke gordetzea bakarrik nahi izatea. Zer egin nahi duzu?"
+"  -r             - bertsioa eta argitalpena ere izenarekin inprimatzen "
+"ditu.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - paketeko fitxategiak zerrendatzen ditu.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"-u               - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
+"  komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
-"  --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "%s falta delako"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"Erabilera: urpmi.update [aukerak] <izena> ...\n"
-"non <izena> eguneratu beharreko euskarri-izena den.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "lehendik dagoen \"%s\" euskarria saltatzeko ahalegina, ekiditen"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Ondoko paketeetako bat behar da %s instalatzeko:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - instalazioa behar bezala egin daitekeen egiaztatzen du.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq %s bertsioa\n"
+#~ "Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Software librea da eta birbanatu egin daiteke GNU GLParen baldintzak "
+#~ "betetzen badira.\n"
+#~ "\n"
+#~ "erabilera:\n"
diff --git a/po/fa.po b/po/fa.po
index 1a4a8af8..07ae00b5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-27 22:36+0430\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
@@ -36,865 +36,780 @@ msgstr "YyبfF"
 msgid "Nn"
 msgstr "NnخنoO"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "نصب %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - بطور خودکار همه‌ی رسانه‌ها را از یک رسانه‌ی نصب ایجاد\n"
-"                   می‌کند.\n"
+"نصب خودکار بسته‌ها...\n"
+"شما تقاضای نصب بسته %s را نمودید\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "نمی‌توان rpmdb را باز کرد"
+msgid "Is this OK?"
+msgstr "تایید می‌کنید؟"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - چاپ این پیغام راهنما.\n"
+msgid "Ok"
+msgstr "تایید"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "یکی از بسته‌های بدنبال آمده برای نصب %s مورد نیاز است:"
+msgid "Cancel"
+msgstr "لغو"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "برداشتن بسته %s"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: فرمان یافت نشد\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "نمی‌توان از حالت موازی با حالت use-distrib استفاده کرد"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"طرز استفاده: %s [گزینه‌ها]\n"
+"[گزینه‌ها] از\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "همه چیز قبلاً نصب شده است"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - چاپ این پیغام راهنما.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - محدودیت نتایج به گروه داده شده.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "استفاده از پروسه‌ی %d برای اجرای مبادله"
+msgid "                    defaults is %s.\n"
+msgstr "                    %s پیش‌فرض است.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
+msgid "unknown protocol defined for %s"
+msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "انتخاب شما چه است؟ (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d سرآیند در حافظه پنهان یافت شد"
+msgid "unable to handle protocol: %s"
+msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "چندین بسته با نام پرونده rpm یکسان \"%s\" وجود دارد"
+msgid "syntax error in config file at line %s"
+msgstr "خطای املایی در پرونده تنظیم در خط %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - کاربر و گذرواژه را برای اعتبارسنجی پراکسی مشخص\n"
-"                   می‌کند (قالب آن <user:password>است).\n"
+"رسانه‌ی \"%s\" سعی می‌کند تا از لیست قبلاً استفاده شده hdlist استفاده کند، "
+"نادیده‌گیری رسانه"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "در حال اجرای دومین نوبت حساب کردن وابستگی‌ها\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"رسانه \"%s\" تلاش می‌کند تا از یک لیست استفاده شده استفاده کند، رسانه نادیده "
+"گرفته می‌شود"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"نمی‌توان رسانه‌ی \"%s\" را بخاطر اینکه پرونده لیست بوسیله رسانه دیگری استفاده "
+"شده اداره کرد"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - نام های مستعار موازی موجود را فهرست می‌کند.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"نمی‌توان از نام \"%s\" برای رسانه‌ی بی‌نام که قبلاً مورد استفاده است استفاده کرد"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...دریافت شکست خورد: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "نمی‌توان رسانه‌ی \"%s\" را در نظر گرفت چرا که پرونده [%s] وجود ندارد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ناتوان در بررسی پرونده‌ی لیست \"%s\", رسانه نادیده گرفته شد"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "نمی‌توان رسانه‌ی این پرونده hdlist را تعیین کرد [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "نمی‌توان به پرونده hdlist \"%s\" دسترسی یافت، رسانه نادیده گرفته می‌شود "
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "نصب بسته..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"نمی‌توان به پرونده لیست \"%s\" دسترسی پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "نام پرونده rpm نامعتبر [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "تلاش برای گذشتن از کنار رسانه‌ی موجود \"%s\", پرهیز"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "تعریف بد پراکسی بر خط فرمان\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"رسانه‌ی مجازی \"%s\" نباید سرلیست یا پرونده‌ی لیست را تعریف می‌کرد، رسانه "
+"نادیده گرفته می‌شود"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d معامله‌های نصب شکست خورد"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"رسانه مجازی \"%s\" باید یک نشانی درست داشته باشد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
-"ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی ماندرایک/پایه/لیست دیسک پیدا "
-"شد)"
+"نمی‌توان پرونده hdlist را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "نمی‌توان پرونده لیست را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "پرونده‌ی لیست بی‌ارتباط برای \"%s\"، رسانه نادیده گرفته شد"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ناتوان در بررسی پرونده‌ی لیست \"%s\", رسانه نادیده گرفته شد"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "نصب گردد"
+msgid "taking removable device as \"%s\""
+msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - استفاده از واسط X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "استفاده از دستگاه قابل انتقال متفاوت [%s] برای \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریافت کرد"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"برای ارضای وابستگی‌ها، بسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
+msgid "unable to write config file [%s]"
+msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - انتخاب بهترین واسط براساس محیط:\n"
-"                   X یا حالت متن .\n"
+msgid "write config file [%s]"
+msgstr "نگارش پرونده تنظیم [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "بارگیری بسته `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "نمی‌توان از حالت موازی با حالت use-distrib استفاده کرد"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "نمی‌توان  \"%s\" را در پرونده [%s] تجزیه کرد"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "آزمایش دستگیره مواری در پرونده‌ی [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "هیچ بسته‌ای با نام %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "یافت دستگیره موازی برای گره‌ها: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "استفاده از رسانه‌های مربوطه برای حالت موازی: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"نصب شکست خورد، بعضی از پرونده‌ها وجود ندارند:\n"
-"%s\n"
-"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
+msgid "unable to use parallel option \"%s\""
+msgstr "نمی‌توان از گزینه موازی \"%s\" استفاده کرد"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"طرز استفاده: urpmi.removemedia [-a] <name> ...\n"
-"که <name> نام رسانه‌ی برای برداشتن می باشد.\n"
+"--synthesis نمی‌تواند با --media, --excludemedia, --sortmedia, --update یا --"
+"parallel استفاده شود"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
-"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "آزمایش پرونده ترکیب [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`با' رسانه‌های شبکه که وجود ندارند\n"
+msgid "examining hdlist file [%s]"
+msgstr "آزمایش پرونده hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "رسانه مجازی \"%s\" محلی نیست، رسانه نادیده‌ گرفته شد"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "بسته‌ی ناشناس"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "مشکل در خواندن سرلیست یا پرونده‌ی ترکیب رسانه‌ی \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "نصب ممکن می‌باشد"
+msgid "performing second pass to compute dependencies\n"
+msgstr "در حال اجرای دومین نوبت حساب کردن وابستگی‌ها\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "نادیده‌گیری بسته‌ی %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "برای ارضای وابستگی‌ها، %d بسته‌ی بدنبال آمده نصب خواهند شد (%d مگابایت)"
+msgid "would install instead of upgrade package %s"
+msgstr "بجای ارتقای بسته %s نصب خواهد شد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "نمی‌توان رسانه‌ی \"%s\" را در نظر گرفت چرا که پرونده [%s] وجود ندارد"
+msgid "unable to open rpmdb"
+msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "رسانه \"%s\" قبلاً وجود دارد"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "نمی‌توان بروزسازی‌ها را به یک انتشار آزمایشی اضافه نمود\n"
+msgid "virtual medium need to be local"
+msgstr "رسانه‌ی مجازی  لازم است محلی باشد"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - حالت لغتی.\n"
+msgid "added medium %s"
+msgstr "رسانه اضافه شده %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "آشناسازی..."
+msgid "unable to access first installation medium"
+msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - لیست کردن بسته‌های موجود.\n"
+msgid "copying hdlists file..."
+msgstr "در حال کپی کردن پرونده hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - چاپ همه برچسب‌ها.\n"
+msgid "...copying failed"
+msgstr "...کپی کردن شکست خورد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان داده شده ولی نه واقعاً"
+msgid "...copying done"
+msgstr "...کپی شد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"رسانه‌ی مجازی \"%s\" نباید سرلیست یا پرونده‌ی لیست را تعریف می‌کرد، رسانه "
-"نادیده گرفته می‌شود"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "حساب کردن md5sum سرلیست منبع کپی شده (یا ترکیب)"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - مسیر بوسیله‌ی ویرگول جدا کننده خارج شود .\n"
+"ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی ماندرایک/پایه/لیست دیسک پیدا "
+"شد)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "وقتی آماده‌اید ورود را فشار دهید..."
+msgid "retrieving hdlists file..."
+msgstr "دریافت پرونده‌ی hdlists..."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"گزینه‌های ناشناس '%s'\n"
+msgid "...retrieving done"
+msgstr "...دریافت انجام گرفت"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - تقسیم به قطعات کوچک اگر بیشتر ار بسته‌های داده شده\n"
-"                   قرار است نصب یا ارتقا داده شوند،\n"
-"                   پیش‌فرض %d می‌باشد.\n"
+msgid "...retrieving failed: %s"
+msgstr "...دریافت شکست خورد: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:720
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "مشکل در خواندن سرلیست یا پرونده‌ی ترکیب رسانه‌ی \"%s\""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "توضیحات نامعتبر hdlist \"%s\" در پرونده hdlists"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:765
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - از wget برای دریافت پرونده‌های دوردست استفاده نمایید.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
+msgid "selecting multiple media: %s"
+msgstr "انتخاب چندین رسانه ها: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "ساختن hdlist [%s]"
+msgid "removing medium \"%s\""
+msgstr "برداشتن رسانه‌ی \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --keep         - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش بسته‌هایی\n"
-"                   که به برداشتن ختم می‌شود.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining MD5SUM file"
-msgstr "آزمایش پرونده‌ی MD5SUM "
-
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: فرمان یافت نشد\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to register rpm file"
-msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
+"نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد،\n"
+"این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
+"اتفاق بیافتد."
 
-#: ../urpmi:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --allow-nodeps - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون بررسی\n"
-"                   وابستگی‌ها را می‌دهد.\n"
+"رسانه‌ی مجازی \"%s\" باید منبع معتبر hdlist یا ترکیب داشته باشد، رسانه نادیده "
+"گرفته شد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "نمی‌توان پایان‌نامه را اداره کرد: %s"
+msgid "copying description file of \"%s\"..."
+msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "دریافت پرونده‌ی hdlists..."
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "حساب کردن md5sum برای hdlist منبع موجود (یا ترکیب)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "Yes, really install it"
-msgstr "بله، واقعا آن نصب شود"
+msgid "examining MD5SUM file"
+msgstr "آزمایش پرونده‌ی MD5SUM "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "added medium %s"
-msgstr "رسانه اضافه شده %s"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "کپی hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "قطعات ایجاد شده برای نصب بر %s (remove=%d, install=%d, upgrade=%d)"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "حساب کردن md5sum سرلیست منبع کپی شده (یا ترکیب)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "md5sum mismatch"
-msgstr "عدم تطابق md5sum "
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "خطای املایی در پرونده تنظیم در خط %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
+msgid "reading rpm files from [%s]"
+msgstr "خواندن پرونده‌های rpm از [%s]"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - استفاده از پراکسی HTTP، شماره درگاه بوسیله‌ی پیش فرض\n"
-"                   ۱۰۸۰ فرض شده است (قالب آن <proxyhost[:port]> می‌باشد).\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "نمی‌توان پرونده‌های rpm را از [%s] خواند: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "in order to install %s"
-msgstr "برای نصب %s"
+msgid "no rpm files found from [%s]"
+msgstr "هیچ پرونده‌های rpm از [%s] پیدا نشد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "جابجایی ورودی‌های %s در depslist"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "بجای ارتقای بسته %s نصب خواهد شد"
+msgid "md5sum mismatch"
+msgstr "عدم تطابق md5sum "
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "دریافت آینه‌ها در %s ..."
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "دریافت لیست منبع (یا ترکیب) شکست خورد"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - چاپ برچسب url: url.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "پایان‌نامه‌ی ناشناس برای %s تعیین شده است"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "پرونده [%s] قبلاً در همان رسانه \"%s\" استفاده شده است"
 
-#: ../urpmq:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - چاپ نسخه و انتشار با نام.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
 
-#: ../urpmf:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
+msgid "unable to write list file of \"%s\""
+msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "رسانه \"%s\" قبلاً وجود دارد"
+msgid "writing list file for medium \"%s\""
+msgstr "نگارش پرونده لیست برای رسانه \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "installing %s\n"
-msgstr "نصب %s\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "هیچ چیزی در پرونده‌ی لیست برای \"%s\" نوشته نشده است"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1603
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ورودی برای بروزسازی وجود ندارد\n"
-"(یکی از %s)\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "trying to promote %s"
-msgstr "تلاش برای ترفیع %s"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "unable to remove package %s"
-msgstr "نمی‌توان بسته‌ی %s را برداشت"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
+msgid "reading headers from medium \"%s\""
+msgstr "خواندن سرآیندها از رسانه \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ورودی برای برداشتن وجود ندارد\n"
-"(یکی از %s)\n"
+msgid "building hdlist [%s]"
+msgstr "ساختن hdlist [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - انتخاب تمام رسانه‌ها.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "عدم وجود امضا (%s)"
+msgid "found %d headers in cache"
+msgstr "%d سرآیند در حافظه پنهان یافت شد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "نمی‌توان پرونده‌های rpm را از [%s] خواند: %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "برداشتن سرآیند‌های کهنه %d در حافظه‌ی پنهان"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
+msgid "mounting %s"
+msgstr "سوار کردن %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
+msgid "unmounting %s"
+msgstr "پیاده کردن %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
+msgid "relocated %s entries in depslist"
+msgstr "جابجایی ورودی‌های %s در depslist"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1929
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "no entries relocated in depslist"
+msgstr "هیچ ورودی‌هایی در depslist جابجا شده است"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - محدودیت نتایج به گروه داده شده.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "نام پرونده rpm نامعتبر [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"رسانه \"%s\" تلاش می‌کند تا از یک لیست استفاده شده استفاده کند، رسانه نادیده "
-"گرفته می‌شود"
+msgid "retrieving rpm file [%s] ..."
+msgstr "در حال دریافت پرونده‌ی rpm [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "درون‌ریز درهمریخته: [%s]"
+msgid "unable to access rpm file [%s]"
+msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
 
-#: ../urpme:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
+msgid "unable to register rpm file"
+msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
 
-#: ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
+msgid "error registering local packages"
+msgstr "خطا در بایگانی کردن بسته‌های محلی"
 
-#: ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
-"%s"
+msgid "no package named %s"
+msgstr "هیچ بسته‌ای با نام %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "نصب بسته `%s' (%s/%s)..."
+msgid "The following packages contain %s: %s"
+msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "هیچ ورودی‌هایی در depslist جابجا شده است"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "چندین بسته با نام پرونده rpm یکسان \"%s\" وجود دارد"
 
-#: ../urpmi:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "نمی توان بدرستی [%s] را بر ارزش \"%s\" تجزیه کرد"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"  --curl         - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
+"رسانه \"%s\" از یک پرونده لیست نامعتبر استفاده می‌کند:\n"
+"  آینه احتمالاً بروز نمی‌باشد، در حال تلاش برای استفاده از روش جایگزین"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "do you agree ?"
-msgstr "آیا موافقید؟"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "رسانه \"%s\" هیچ مکانی را برای پرونده‌های rpm مشخص نمی‌کند"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "پرونده‌ی لیست بی‌ارتباط برای \"%s\"، رسانه نادیده گرفته شد"
+msgid "package %s is not found."
+msgstr "بسته‌ی %s پیدا نشد."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "...retrieving done"
-msgstr "...دریافت انجام گرفت"
+msgid "urpmi database locked"
+msgstr "بانک اطلاعات urpmi قفل شده است"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "افرودن بسته %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "medium \"%s\" is not selected"
+msgstr "رسانه \"%s\" انتخاب نشده است"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "skipping package %s"
-msgstr "نادیده‌گیری بسته‌ی %s"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "نمی‌توان پرونده rpm [%s] را از رسانه \"%s\" خواند"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "امضای نامعتبر (%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان داده شده ولی نه واقعاً"
 
-#: ../urpmq:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "نام‌ها یا پرونده‌های داده شده بر خط فرمان مورد تردید می‌باشند.\n"
+msgid "unable to access medium \"%s\""
+msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
 
-#: ../urpmi:1
+#: ../urpm.pm:2635
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"نسخه urpmi %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"این نرم‌افزار آزاد بوده ومی‌تواند تحت شرایط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
+msgid "malformed input: [%s]"
+msgstr "درون‌ریز درهمریخته: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "نمی توان بدرستی [%s] را بر ارزش \"%s\" تجزیه کرد"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
+msgid "Preparing..."
+msgstr "در حال آماده کردن..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "نمی‌توان رسانه‌ی این پرونده hdlist را تعیین کرد [%s]"
+msgid "using process %d for executing transaction"
+msgstr "استفاده از پروسه‌ی %d برای اجرای مبادله"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "قطعات ایجاد شده برای نصب بر %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"رسانه‌ی \"%s\" سعی می‌کند تا از لیست قبلاً استفاده شده hdlist استفاده کند، "
-"نادیده‌گیری رسانه"
+msgid "unable to create transaction"
+msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "بدلیل اختلاف با %s"
+msgid "removing package %s"
+msgstr "برداشتن بسته %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "برداشتن سرآیند‌های کهنه %d در حافظه‌ی پنهان"
+msgid "unable to remove package %s"
+msgstr "نمی‌توان بسته‌ی %s را برداشت"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "نمی‌توان رسانه \"%s\" را بروزسازی کرد\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "افرودن بسته %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
+msgid "unable to install package %s"
+msgstr "نمی‌توان بسته %s را نصب کرد"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "رسانه مجازی \"%s\" محلی نیست، رسانه نادیده‌ گرفته شد"
+msgid "due to missing %s"
+msgstr "بدلیل عدم وجود %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "در حال آماده کردن..."
+msgid "due to unsatisfied %s"
+msgstr "بدلیل عدم رضایت %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    %s پیش‌فرض است.\n"
+msgid "trying to promote %s"
+msgstr "تلاش برای ترفیع %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "استفاده از دستگاه قابل انتقال متفاوت [%s] برای \"%s\""
+msgid "in order to keep %s"
+msgstr "برای نگهداشتن %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - تلاش برای یافتن هیچ پرونده‌ی ترکیب یا\n"
-"                   hdlist نشود.\n"
+msgid "in order to install %s"
+msgstr "برای نصب %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
+msgid "due to conflicts with %s"
+msgstr "بدلیل اختلاف با %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
+msgid "unrequested"
+msgstr "خواسته نشده"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - پیکربندی urpmi در هوا از درخت distrib.\n"
-"                   این پرسش یک توزیع را اجازه می‌دهد.\n"
+msgid "Invalid signature (%s)"
+msgstr "امضای نامعتبر (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"طرز استفاده: %s [گزینه‌ها]\n"
-"[گزینه‌ها] از\n"
+msgid "Invalid Key ID (%s)"
+msgstr "شناسه کلید نامعتبر (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - برداشتن rpm از حافظه پنهان قبل از هر چیز دیگر.\n"
+msgid "Missing signature (%s)"
+msgstr "عدم وجود امضا (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"نمی‌توان از نام \"%s\" برای رسانه‌ی بی‌نام که قبلاً مورد استفاده است استفاده کرد"
+msgid "bad proxy declaration on command line\n"
+msgstr "تعریف بد پراکسی بر خط فرمان\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"رسانه‌ی مجازی \"%s\" باید منبع معتبر hdlist یا ترکیب داشته باشد، رسانه نادیده "
-"گرفته شد"
+msgid "Sorry, bad choice, try again\n"
+msgstr "متأسفم، انتخاب بد، دوباره امتحان کنید\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -910,1078 +825,1208 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - چاپ این پیغام راهنما.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"طرز استفاده: urpmi.addmedia [گزینه‌ها] <name> <url> [با <relative_path>]\n"
-"که <url> یکی از\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> با <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> با <relative filename of hdlist>\n"
-"       http://<host>/<path> با <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"و [گزینه‌ها] هستند از\n"
+"  --test         - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "کپی hdlist منبع (یا ترکیب) \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...کپی شد"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "نمی‌توان از گزینه موازی \"%s\" استفاده کرد"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"رسانه \"%s\" از یک پرونده لیست نامعتبر استفاده می‌کند:\n"
-"  آینه احتمالاً بروز نمی‌باشد، در حال تلاش برای استفاده از روش جایگزین"
+"  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
+"                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - حالت لغتی.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "رسانه‌ی مجازی  لازم است محلی باشد"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "خطا در بایگانی کردن بسته‌های محلی"
+msgid "unknown packages"
+msgstr "بسته‌های ناشناس"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - محدود کردن سرعت بارگیری.\n"
+msgid "unknown package"
+msgstr "بسته‌ی ناشناس"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
+msgid "removing package %s will break your system"
+msgstr "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "دریافت لیست منبع (یا ترکیب) شکست خورد"
+msgid "Nothing to remove"
+msgstr "هیچ چیزی برای برداشتن"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "هیچ پرونده‌های rpm از [%s] پیدا نشد"
+msgid "Checking to remove the following packages"
+msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "هیچ چیزی در پرونده‌ی لیست برای \"%s\" نوشته نشده است"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"برای ارضای وابستگی‌ها، بسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "حساب کردن md5sum برای hdlist منبع موجود (یا ترکیب)"
+msgid "removing %s"
+msgstr "برداشتن %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
+msgid "Removing failed"
+msgstr "برداشتن شکست خورد"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "نمی‌توان بسته %s را نصب کرد"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
-"                   بررسی وابستگی و درستی آنها.\n"
+"  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "ذخیره‌ی پرونده"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
+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"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "شناسه کلید نامعتبر (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - چاپ همه برچسب‌ها.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریافت کرد"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relative path of hdlist> وجود ندارد\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "خواسته نشده"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یافت"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - چاپ برچسب پرونده ها: همه پرونده‌ها.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "نمی‌توان  \"%s\" را در پرونده [%s] تجزیه کرد"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - چاپ برچسب پرونده ها: همه پرونده‌ها.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "نمی‌توان پرونده rpm [%s] را از رسانه \"%s\" خواند"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"··--use-distrib··-·urpmi·را·در·هوا·از·درخت·distrib·پیکربندی·می‌کند،·برای\n"
-"···················نصب(برداری)·یک·chroot·با·گزینه‌ی·--root·مفید·است.\n"
+"  --env          - استفاده از محیط مشخص (معمولاً یک گزارش\n"
+"                   اشکال).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - اطلاعات مفید را به زبان آدمیزاد چاپ می‌کند.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - استفاده از نسخه انتشار مشخص شده، پیش‌فرض از نسخه انتشار\n"
-"                   گفته شده توسط بسته نصب شده انتشار-ماندرایک \n"
-"                   گرفته شده است.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - استفاده از url مشخص شده برای لیست آینه‌ها،پیش‌فرض\n"
-"                   %s می‌باشد\n"
+"  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
-"                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
+"  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, true اگر عبارت false باشد.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - پرانطز چپ برای باز کردن عبارت گروه.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
-"کنید یاآن را حذف کنید"
+"callback is :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "پیاده کردن %s"
+msgid "using specific environment on %s\n"
+msgstr "استفاده از محیط مشخص بر %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% تکمیل شد, سرعت = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"نسخه urpmi %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"این نرم‌افزار آزاد بوده ومی‌تواند تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "راه‌اندازی دوباره‌ی urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "آزمایش پرونده ترکیب [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...کپی کردن شکست خورد"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش بسته‌هایی\n"
+"                   که به برداشتن ختم می‌شود.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "نمی‌توان به پرونده hdlist \"%s\" دسترسی یافت، رسانه نادیده گرفته می‌شود "
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - تقسیم به قطعات کوچک اگر بیشتر ار بسته‌های داده شده\n"
+"                   قرار است نصب یا ارتقا داده شوند،\n"
+"                   پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - حالت ساکت.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - اندازه‌های کوچک انتقال, پیش‌فرض %d می‌باشد.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - حالت لغتی.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - تحمیل جستجوی فازی (همانند -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - همه بسته‌های منابع را قبل از باگیری می‌دهد (فقط مدیر).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - بازیابی سرآیندها برای بسته فهرست شده از  urpmi db به\n"
-"                   stdout (فقط مدیر).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - فقط بسته‌ی منبع نصب می‌شود (نه باینری).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "بسته‌های ناشناس"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - برداشتن rpm از حافظه پنهان قبل از هر چیز دیگر.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "انتخاب چندین رسانه ها: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون بررسی\n"
+"                   وابستگی‌ها را می‌دهد.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "پرونده [%s] قبلاً در همان رسانه \"%s\" استفاده شده است"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
+"                   بررسی وابستگی و درستی آنها.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"هیچ چیز برای برداشتن (استفاده از urpmi.addmedia برای افزودن یک رسانه)\n"
+"··--use-distrib··-·urpmi·را·در·هوا·از·درخت·distrib·پیکربندی·می‌کند،·برای\n"
+"···················نصب(برداری)·یک·chroot·با·گزینه‌ی·--root·مفید·است.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "نمی‌توان پرونده لیست را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - از wget برای دریافت پرونده‌های دوردست استفاده نمایید.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - چاپ این پیغام راهنما.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - از curl برای دریافت پرونده‌های دور دست استفاده شود.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "یافت دستگیره موازی برای گره‌ها: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - محدود کردن سرعت بارگیری.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"callback is :\n"
-"%s\n"
+"  --resume       - باز از سر گیری انتقال پرونده‌های بارگیری شده‌ی ناقص\n"
+"                   (--no-resume آن را از کار می‌اندازد, ازکارافتاده پیش‌فرض "
+"است).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - استفاده از پراکسی HTTP، شماره درگاه بوسیله‌ی پیش فرض\n"
+"                   ۱۰۸۰ فرض شده است (قالب آن <proxyhost[:port]> می‌باشد).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
+"  --proxy-user   - کاربر و گذرواژه را برای اعتبارسنجی پراکسی مشخص\n"
+"                   می‌کند (قالب آن <user:password>است).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - برچسب نام چاپ نشود (پیش‌فرض اگر هیچ برچسبی بر فرمان داده "
-"نشود\n"
-"                   خط, غیرهمخوان با حالت تأثیری).\n"
+"  --bug          - بیرون‌ریزی یک گزارش اشکال در شاخه‌ی مشخص شده بوسیله\n"
+"                   مبحث بعدی.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - استفاده از واسط X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis نمی‌تواند با --media, --excludemedia, --sortmedia, --update یا --"
-"parallel استفاده شود"
+"  --best-output  - انتخاب بهترین واسط براساس محیط:\n"
+"                   X یا حالت متن .\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - استفاده از ساختار مشخص شده، پیش‌فرض ساختار \n"
-"                   بسته نصب شده انتشار ماندرایک است.\n"
+"  --verify-rpm   - تصدیق امضاهای rpm قبل از نصب\n"
+"                   (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "تایید می‌کنید؟"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - مسیر بوسیله‌ی ویرگول جدا کننده خارج شود .\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - پرونده‌های نوشتاری محسوب نشوند.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - انتخاب همه مطابقت‌ها بر خط فرمان.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "آزمایش دستگیره مواری در پرونده‌ی [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - جستجو در عرضه‌ها برای یافتن بسته را اجازه می‌دهد.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "هیچ چیزی برای برداشتن"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - جستجو در عرضه‌ها برای یافتن بسته نشود.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - تحمیل جستجوی فازی (همانند --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "خواندن سرآیندها از رسانه \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - پرسش گسترده برای وابستگی‌های بسته.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  نام‌ها یا پرونده‌های rpm داده شده بر خط فرمان نصب خواهند شد.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
+
+#: ../urpmi:197
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --bug          - بیرون‌ریزی یک گزارش اشکال در شاخه‌ی مشخص شده بوسیله\n"
-"                   مبحث بعدی.\n"
+"آنچه می‌توان با پرونده‌های باینری rpm انجام داد هنگام استفاده --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "رسانه \"%s\" هیچ مکانی را برای پرونده‌های rpm مشخص نمی‌کند"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"شما بسته‌ی منبعی را انتخاب کرده‌اید:\n"
+"\n"
+"%s\n"
+"\n"
+"احتمالا نمی‌خواستید آن را بر رایانه‌ی خود نصب کنید (نصب کردن آن\n"
+"به شما اجازه می‌دهد تا کد منبع آن را پیرایش کرده و سپس آن را کمپایل کنید).\n"
+"\n"
+"چکار می‌خواهید انجام دهید؟"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
+msgid "Do nothing"
+msgstr "هیچکاری "
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "نمی توان پرونده لیست \"%s\" را نوشت"
+msgid "Yes, really install it"
+msgstr "بله، واقعا آن نصب شود"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
+msgid "Save file"
+msgstr "ذخیره‌ی پرونده"
 
-#: ../urpm.pm:1
+#: ../urpmi:225
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"شما در شرف نصب کردن بسته‌ی نرم‌افزار بدنبال آمده بر رایانه‌ی خود هستید:\n"
+"\n"
+"%s\n"
+"\n"
+"ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
+msgid "Install it"
+msgstr "نصب گردد"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "کپی کردن شکست خورد"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"شاخه‌ی [%s] از قبل وجود دارد، لطفا از شاخه‌ی دیگری برای گزارش اشکال استفاده "
+"کنید یاآن را حذف کنید"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "نمی‌توان شاخه‌ی [%s] را برای گزارش اشکال ایجاد کرد"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
+msgid "Copying failed"
+msgstr "کپی کردن شکست خورد"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
+msgid "Only superuser is allowed to install packages"
+msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
+msgid "One of the following packages is needed:"
+msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "نصب %s"
+msgid "What is your choice? (1-%d) "
+msgstr "انتخاب شما چه است؟ (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "خواندن پرونده‌های rpm از [%s]"
+msgid "Package installation..."
+msgstr "نصب بسته..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
+msgid "Initializing..."
+msgstr "آشناسازی..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "برداشتن شکست خورد"
+msgid "do you agree ?"
+msgstr "آیا موافقید؟"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - ایجاد رسانه مجازی که همیشه بروز شده هستند،\n"
-"                   فقط پایان‌نامه file:// مجاز می‌باشد.\n"
+"نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
+"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "بسته‌ی %s پیدا نشد."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "برداشتن رسانه‌ی \"%s\""
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "برای ارضای وابستگی‌ها، %d بسته‌ی بدنبال آمده نصب خواهند شد (%d مگابایت)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "لغو"
+msgid "unable to get source packages, aborting"
+msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - بسته‌ی بعدی یک بسته‌ی منبع (مانند -s) می‌باشد.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - استفاده از محیط مشخص (معمولاً یک گزارش\n"
-"                   اشکال).\n"
+msgid "Press Enter when ready..."
+msgstr "وقتی آماده‌اید ورود را فشار دهید..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
+msgid "Downloading package `%s'..."
+msgstr "بارگیری بسته `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s تکمیل شد, ETA = %s, سرعت = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% تکمیل شد, سرعت = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
+msgid "The following packages have bad signatures"
+msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - تخلیه‌ی پیکربندی به شکل آرگومان urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
+"نصب شکست خورد، بعضی از پرونده‌ها وجود ندارند:\n"
 "%s\n"
+"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - چاپ ثبت تغییرات.\n"
+msgid "Installation failed"
+msgstr "نصب شکست خورد"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"نمی‌توان به پرونده لیست \"%s\" دسترسی پیدا کرد، رسانه نادیده گرفته می‌شود"
+msgid "distributing %s"
+msgstr "انتشار دادن %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
+msgid "installing %s"
+msgstr "نصب %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "هیچ webfetch یافت نشد، webfetch دارای پشتیبانی: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "نصب بسته `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "آزمایش پرونده hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "در حال کپی کردن پرونده hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "نگارش پرونده لیست برای رسانه \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d معامله‌های نصب شکست خورد"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"رسانه مجازی \"%s\" باید یک نشانی درست داشته باشد، رسانه نادیده گرفته می‌شود"
+msgid "Installation is possible"
+msgstr "نصب ممکن می‌باشد"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
+msgid "Everything already installed"
+msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "هیچکاری "
+msgid "restarting urpmi"
+msgstr "راه‌اندازی دوباره‌ی urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"طرز استفاده: urpmi.addmedia [گزینه‌ها] <name> <url> [با <relative_path>]\n"
+"که <url> یکی از\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> با <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> با <relative filename of hdlist>\n"
+"       http://<host>/<path> با <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"و [گزینه‌ها] هستند از\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "استفاده از رسانه‌های مربوطه برای حالت موازی: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "سوار کردن %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"نمی‌توان رسانه‌ی \"%s\" را بخاطر اینکه پرونده لیست بوسیله رسانه دیگری استفاده "
-"شده اداره کرد"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - تلاش برای یافتن هیچ پرونده‌ی ترکیب یا\n"
+"                   hdlist نشود.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - بطور خودکار همه‌ی رسانه‌ها را از یک رسانه‌ی نصب ایجاد\n"
+"                   می‌کند.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s تکمیل شد, ETA = %s, سرعت = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - ایجاد خودکار یک رسانه برای XXX قسمت از یک\n"
+"                   انتشار، XXX می‌تواند یک اصل، کمک، بروزسازی‌ها یا \n"
+"                   هرچیز دیگر تنظیم شده باشد ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - استفاده از url مشخص شده برای لیست آینه‌ها،پیش‌فرض\n"
+"                   %s می‌باشد\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - استفاده از نسخه انتشار مشخص شده، پیش‌فرض از نسخه انتشار\n"
+"                   گفته شده توسط بسته نصب شده انتشار-ماندرایک \n"
+"                   گرفته شده است.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - هرگز برای عزل یک بسته پرسش نشود، پایان نصب.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - استفاده از ساختار مشخص شده، پیش‌فرض ساختار \n"
+"                   بسته نصب شده انتشار ماندرایک است.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"این نرم‌افزار آزاد می‌باشد و ممکن است تحت شرایط GNU GPL انتشار مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
+"  --virtual      - ایجاد رسانه مجازی که همیشه بروز شده هستند،\n"
+"                   فقط پایان‌نامه file:// مجاز می‌باشد.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - چاپ گروه‌ها با نام.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - سرآیندهای شاخه حافظه پنهان را پاک می‌کند.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "رسانه \"%s\" انتخاب نشده است"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "فقط کاربر برتر برای نصب بسته‌ها مجاز می‌باشد"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "نمی‌توان بروزسازی‌ها را به یک انتشار آزمایشی اضافه نمود\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "استفاده از محیط مشخص بر %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "دریافت آینه‌ها در %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"نمی‌توان پرونده hdlist را برای \"%s\" پیدا کرد، رسانه نادیده گرفته می‌شود"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - اندازه‌های کوچک انتقال, پیش‌فرض %d می‌باشد.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "نمی‌توان رسانه \"%s\" را بروزسازی کرد\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - پرانطز چپ برای باز کردن عبارت گروه.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path of hdlist> وجود ندارد\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`با' رسانه‌های شبکه که وجود ندارند\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد،\n"
-"این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
-"اتفاق بیافتد."
+"طرز استفاده: urpmi.removemedia [-a] <name> ...\n"
+"که <name> نام رسانه‌ی برای برداشتن می باشد.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - انتخاب تمام رسانه‌ها.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - فقط از رسانه‌های داده شده، جدا شده با ویرگول استفاده شود.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "نمی‌توان تکه‌های انتقالی را ایجاد کرد"
+"\n"
+"گزینه‌های ناشناس '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "دریافت پرونده‌های rpm از رسانه \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"هیچ چیز برای برداشتن (استفاده از urpmi.addmedia برای افزودن یک رسانه)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"شما بسته‌ی منبعی را انتخاب کرده‌اید:\n"
-"\n"
-"%s\n"
-"\n"
-"احتمالا نمی‌خواستید آن را بر رایانه‌ی خود نصب کنید (نصب کردن آن\n"
-"به شما اجازه می‌دهد تا کد منبع آن را پیرایش کرده و سپس آن را کمپایل کنید).\n"
-"\n"
-"چکار می‌خواهید انجام دهید؟"
+"ورودی برای برداشتن وجود ندارد\n"
+"(یکی از %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "انتشار دادن %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"طرز استفاده: urpmi.update [گزینه‌ها] <name> ...\n"
+"که <name> یک نام رسانه برای بروزسازی می‌باشد.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "نصب شکست خورد"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "نگارش پرونده تنظیم [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - اجبار بروزسازی کلید gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - انتخاب همه رسانه‌های غیر قابل انتقال.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - تصدیق امضاهای rpm قبل از نصب\n"
-"                   (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
+"ورودی برای بروزسازی وجود ندارد\n"
+"(یکی از %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - لیست کردن بسته‌های موجود.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - رسانه‌ی در دسترس و url آنها را فهرست می‌کند.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - تحمیل جستجوی فازی (همانند --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config  - تخلیه‌ی پیکربندی به شکل آرگومان urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "تایید"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "توضیحات نامعتبر hdlist \"%s\" در پرونده hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - نام های مستعار موازی موجود را فهرست می‌کند.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "برداشتن %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - بازیابی سرآیندها برای بسته فهرست شده از  urpmi db به\n"
+"                   stdout (فقط مدیر).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - ایجاد خودکار یک رسانه برای XXX قسمت از یک\n"
-"                   انتشار، XXX می‌تواند یک اصل، کمک، بروزسازی‌ها یا \n"
-"                   هرچیز دیگر تنظیم شده باشد ;-)\n"
+"  --sources      - همه بسته‌های منابع را قبل از باگیری می‌دهد (فقط مدیر).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - پیکربندی urpmi در هوا از درخت distrib.\n"
+"                   این پرسش یک توزیع را اجازه می‌دهد.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "برای نگهداشتن %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - چاپ ثبت تغییرات.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "بدلیل عدم رضایت %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - پرسش گسترده برای وابستگی‌های بسته.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"نصب خودکار بسته‌ها...\n"
-"شما تقاضای نصب بسته %s را نمودید\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "بانک اطلاعات urpmi قفل شده است"
+"  -u             - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - باز از سر گیری انتقال پرونده‌های بارگیری شده‌ی ناقص\n"
-"                   (--no-resume آن را از کار می‌اندازد, ازکارافتاده پیش‌فرض "
-"است).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - اطلاعات مفید را به زبان آدمیزاد چاپ می‌کند.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - چاپ گروه‌ها با نام.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"شما در شرف نصب کردن بسته‌ی نرم‌افزار بدنبال آمده بر رایانه‌ی خود هستید:\n"
-"\n"
-"%s\n"
-"\n"
-"ممکن ایت ترجیح دهید فقط آن را ذخیره کنید. امنخاب شما کدام است؟"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - چاپ نسخه و انتشار با نام.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - تحمیل جستجوی فازی (همانند -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "نام‌ها یا پرونده‌های داده شده بر خط فرمان مورد تردید می‌باشند.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - تلاش برای پیدا کردن و استفاده از پرونده‌ی hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes فقط می‌توانند با --parallel استفاده شود"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "بدلیل عدم وجود %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"طرز استفاده: urpmi.update [گزینه‌ها] <name> ...\n"
-"که <name> یک نام رسانه برای بروزسازی می‌باشد.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "تلاش برای گذشتن از کنار رسانه‌ی موجود \"%s\", پرهیز"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "یکی از بسته‌های بدنبال آمده برای نصب %s مورد نیاز است:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "این نرم‌افزار آزاد می‌باشد و ممکن است تحت شرایط GNU GPL انتشار مجدد گردد.\n"
+#~ "\n"
+#~ "طرز استفاده:\n"
diff --git a/po/fi.po b/po/fi.po
index bd1fdc0a..62429ed3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 21:56+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.com>\n"
@@ -41,876 +41,779 @@ msgstr "KkYy"
 msgid "Nn"
 msgstr "EeNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "asennan %s \n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib       - luo automaattisesti kaikki mediat asennusmedioista\n"
+"Pakettien automaattinen asennus...\n"
+"Lähetit pyynnön paketin %s asentamisesta\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpm tietokantaa ei voitu avata"
+msgid "Is this OK?"
+msgstr "Sopiiko tämä?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help          - tulosta tämä viesti.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Yksi seuraavista paketeista täytyy asentaa: %s : "
+msgid "Cancel"
+msgstr "Peruuta"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "poistetaan paketti %s "
+msgid " (Y/n) "
+msgstr " (K/e) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\" "
+msgid "%s: command not found\n"
+msgstr "%s: komentoa ei löytynyt\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "parallel optiota ei voida käyttää use-distrib option kanssa"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"käyttö: %s [optiot]\n"
+"jossa [optiot] ovat:\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Kaikki on jo asennettu"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "  -h|--help       - tulosta tämä viesti.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c              - puhdista otsikkotietojen välimuistihakemisto.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --[group]       - rajoita annettuun ryhmään.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "käytetään prosessia %d tehtävän suorittamiseen"
+msgid "                    defaults is %s.\n"
+msgstr "                  - oletus on %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - tulosta merkintä tarjoaa: kaikki tarjoaa.\n"
+msgid "unknown protocol defined for %s"
+msgstr "tuntematon protokolla määrätty kohteelle %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Mikä on valintasi? ( 1 - %d) : "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "yhtäkään webfetch ei löydetty, tuetut ovat: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "välimuistista löytyi %d otsikkokenttää"
+msgid "unable to handle protocol: %s"
+msgstr "ei voida käsitellä protokollaa: '%s'"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "löytyy useita paketteja joilla on sama rpm tiedostonimi \"%s\" "
+msgid "syntax error in config file at line %s"
+msgstr "syntaksivirhe asetustiedostossa rivissä %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user    - määrittele käyttäjä ja salasana välityspalvelimen\n"
-"                    todentamisessa (muodossa <käyttäjä:salasana>).\n"
+"media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "suoritetaan toinen kierros riippuvuuksien määrittelemiseksi\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" yrittää käyttää jo käytössä olevaa listaa, media ohitettu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "haetaan rpm tiedostoa [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"mediaa \"%s\" ei voitu käyttää koska list-tiedosto on jo toisen median "
+"käytössä"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases  - listaa käytettävissä rinnakkais-aliakset.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nimeä \"%s\" ei voida käyttää nimeämättömälle medialle, koska se on jo "
+"käytössä"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...noutaminen epäonnistui: %s "
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "mediaa \"%s\" ei voida huomioida, koska list-tiedosto [%s| puuttuu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ei voitu tarkistaa list-tiedostoa kohteelle \"%s\", media ohitettu"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "mahdotonta määrittää tämän hdlist tiedoston [%s] mediaa"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o              - binäärinen OR operaattori, oikea jos yksi lausekkeista\n"
-"                    on oikea.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "en voi käyttää media \"%s\" hdlist tiedosto, media ohitetaan"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Pakettia asennetaan..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ei voida käyttää median \"%s\" list-tiedostoa, media ohitetaan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "virheellinen rpm-tiedoston nimi [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "yritetään ohittaa olemassa olevaa mediaa \"%s\", vältetään"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "virheellinen välityspalvelinmääritys komentorivissä\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuaalisella medialla \"%s\" ei pitäisi olla määriteltynä hdlist- tai list-"
+"tiedostoa, media ohitettu"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d asennustoiminnot epäonnistuivat"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"virtuaalisella medialla \"%s\" pitäisi olla kunnollinen url, media ohitettu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ensimmäistä asennusmediaa ei voida käyttää (tiedostoa Mandrake/base/hdlists "
-"ei löydy)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kohteelle \"%s\" ei löytynyt hdlist-tiedostoa, media ohitettu"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kohteelle \"%s\" ei löytynyt listatiedostoa, media ohitettu"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Valitse hakemisto johon tiedosto tallennetaan"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "hajanainen list tiedosto kohteelle \"%s\", media ohitettu"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - tulosta merkintä yhteenveto: yhteenveto.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ei voitu tarkistaa list-tiedostoa kohteelle \"%s\", media ohitettu"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Seuraavat paketit sisältävät %s: %s "
+msgid "too many mount points for removable medium \"%s\""
+msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Asenna sitä"
+msgid "taking removable device as \"%s\""
+msgstr "käytetään siirettävä laite kohteena \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X             - käytä X käyttöliittymää.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "käytetään erillistä siirrettävää laitetta [%s] kohteelle \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Yksi seuraavista paketeista tarvitaan:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "hakemiston nimeä ei voida noutaa siirrettävälle medialle \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
+msgid "unable to write config file [%s]"
+msgstr "asetustiedostoon [%s] ei voitu kirjoittaa "
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output   - valitse paras käyttöliittymä ympäristön mukaan:\n"
-"                    X tai teksti tilassa.\n"
+msgid "write config file [%s]"
+msgstr "kirjoitetaan asetustiedosto [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Ladataan pakettia `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "parallel optiota ei voida käyttää use-distrib option kanssa"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mitä voidaan tehdä binääri rpm-tiedostolla kun käytetään --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "en voi tulkata \"%s\" tiedostossa [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select   - valitse automaattisesti päivitettävät paketit.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "tutkitaan rinnakkaiskäsittelijän tiedostossa [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "ei pakettia nimeltä %s "
+msgid "found parallel handler for nodes: %s"
+msgstr "rinnakkais-käsittelijä löydetty noodeille: %s "
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "käytetään sidotut mediat rinnakkais tapaan: %s "
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
-"%s \n"
-"Sinun kannattaisi päivittää urpmi tietokanta"
+msgid "unable to use parallel option \"%s\""
+msgstr "en voi käyttää rinnakkais optiota \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"käyttö: urpmi.removemedia [-a] <nimi> ...\n"
-"jossa <nimi> on poistettavan median nimi.\n"
+"--synthesis ei voida käyttää ---media, --excludemedia, --sortmedia, --update "
+"tai --parallel kanssa"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
-"jotta toiset voidaan päivittää:\n"
-"%s \n"
+msgid "examining synthesis file [%s]"
+msgstr "tutkitaan synteesitiedostoa [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "verkkomedian kohta `with' puuttuu\n"
+msgid "examining hdlist file [%s]"
+msgstr "tutkitaan hdlist-tiedostoa [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l              - listaa paketissa olevia tiedostoja.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuaalinen media \"%s\" ei ole paikallinen, media ohitettu"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "tuntematon paketti"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "ongelmia luettaessa hdlist- tai synthesis-tiedostoa medialle \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Asennus on mahdollinen"
+msgid "performing second pass to compute dependencies\n"
+msgstr "suoritetaan toinen kierros riippuvuuksien määrittelemiseksi\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
-"%s "
+msgid "skipping package %s"
+msgstr "ohitetaan paketti %s "
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Riippuvuuksien täyttämiseksi seuraavat %d paketit asennetaan (%d Mt)"
+msgid "would install instead of upgrade package %s"
+msgstr "paketti %s asennettaisiin päivittämisen sijaan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "mediaa \"%s\" ei voida huomioida, koska list-tiedosto [%s| puuttuu"
+msgid "unable to open rpmdb"
+msgstr "rpm tietokantaa ei voitu avata"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (k/E) "
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" on jo olemassa"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ei voida lisätä cooker jakelun päivityksiä\n"
+msgid "virtual medium need to be local"
+msgstr "virtuaalisen median on oltava paikallinen"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v              - yksityiskohtainen tyyli.\n"
+msgid "added medium %s"
+msgstr "media %s lisätty"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Alustetaan..."
+msgid "unable to access first installation medium"
+msgstr "en voi käyttää ensimmäistä asennusmediaa"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - listaa käytettävissä olevat paketit.\n"
+msgid "copying hdlists file..."
+msgstr "kopioidaan hdlists-tiedostoa ..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - tulosta kaikki merkinnät.\n"
+msgid "...copying failed"
+msgstr "... kopiointi epäonnistui"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"hajanainen media \"%s\" merkitty siirrettäväksi, vaikkei oikeastaan ole"
+msgid "...copying done"
+msgstr "... kopiointi valmis"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuaalisella medialla \"%s\" ei pitäisi olla määriteltynä hdlist- tai list-"
-"tiedostoa, media ohitettu"
+"ensimmäistä asennusmediaa ei voida käyttää (tiedostoa Mandrake/base/hdlists "
+"ei löydy)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"lasketaan md5sum lähteestä kopioidulle hdlist- tai synthesis-tiedostolle"
+msgid "retrieving hdlists file..."
+msgstr "haetaan hdlists tiedostoa..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-"  --excludepath   - jätä asentamatta seuraaviin hakemistoihin\n"
-"                    (hakemistot pikuilla erotettuna)\n"
+msgid "...retrieving done"
+msgstr "...hakeminen valmis"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Paina Enter kun olet valmis..."
+msgid "...retrieving failed: %s"
+msgstr "...noutaminen epäonnistui: %s "
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tuntemattomat valitsimet '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "virheellinen hdlist kuvaus \"%s\" hdlists tiedostossa"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level   - hajoita pieniin tapahtumiin mikäli enemmän kuin annettu\n"
-"                    pakettimäärä aiotaan asentaa tai päivittää,\n"
-"                    oletus on %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "yritettiin valita puuttuva media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "ongelmia luettaessa hdlist- tai synthesis-tiedostoa medialle \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "valitaan useampi media: %s "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget          - käytä wget etätiedostojen hakemiseen.\n"
+msgid "\"%s\""
+msgstr "\"%s\" "
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "poistetaan mediaa \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p              - sallii etsimisen 'tarjoaa' tiedoista paketin "
-"löytämiseksi.\n"
+"ei voida käyttää mediaa \"%s\",\n"
+"tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes    - listaa käytettävissä olevat noodit käytettäessä --"
-"parallel.\n"
+"virtuaalisella medialla \"%s\" pitäisi olla kunnollinen lähde-hdlist tai -"
+"synthesis, media ohitettu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "rakennetaan hdlist-tiedostoa [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kopioidaan \"%s\" tiedoston kuvausta"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  --keep          - jätä olemassaolevat paketit jos mahdollista, hylkää\n"
-"                    paketit joiden asentaminen poistaisi muita.\n"
+"lasketaan md5sum olemassaolevalle lähde hdlist tai synthesis-tiedostolle"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "tutkitaan MD5SUM-tiedostoa"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komentoa ei löytynyt\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopioidaan lähteen \"%s\" hdlist-tiedostoa (tai synthesis)..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm tiedoston rekisteröinti ei onnistunut"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
-"  --allow-nodeps  - sallii pakettien asennuksen ilman\n"
-"                    riippuvuuksien tarkistusta.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ei voida käsitellä protokollaa: '%s'"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "haetaan hdlists tiedostoa..."
+"lasketaan md5sum lähteestä kopioidulle hdlist- tai synthesis-tiedostolle"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Kyllä, haluan asentaa sitä"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] kopiointi epäonnistui (md5sum ei täsmää)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "media %s lisätty"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "ongelmia luettaessa synthesis-tiedostoa medialle \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean       - pidä käyttämätön rpm paketti välimuistissa.\n"
+msgid "reading rpm files from [%s]"
+msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "luotiin tapahtuma asennukselle %s (poisto=%d, asennus=%d, päivitys=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum ei täsmää"
+msgid "no rpm files found from [%s]"
+msgstr "rpm-tiedostoja ei löytynyt paikasta [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaksivirhe asetustiedostossa rivissä %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "haetaan lähteen hdlist (tai synthesis) kohteelta \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "löydettiin etsitty hdlist- tai synthesis-tiedosto nimellä %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy         - käytä määrättyä HTTP-välityspalvelinta, porttinumeron\n"
-"                    oletetaan olevan 1080 (muodossa <välityspalvelin [:"
-"portti]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "lasketaan md5sum haetulle lähde-hdlist tai -synthesis-tiedostolle"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "asentaakseni %s"
+msgid "md5sum mismatch"
+msgstr "md5sum ei täsmää"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "muutettiin %s kohdetta tiedostossa depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "lähteen hdlistin (tai synteesin) noutaminen epäonnistui"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i              - jätä huomiotta isojen/pienten kirjasinten erottelu \n"
-"                    hakuehdoissa.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "hdlist tiedostoa ei löydetty medialle \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "tiedosto [%s] on jo käytössä samassa mediassa \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "paketti %s asennettaisiin päivittämisen sijaan"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "hdlist-tiedostoa \"%s\" ei voida tulkata"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "haen peilipalvelinlistaa kohteesta %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "ei voida kirjoittaa listatiedostoa \"%s\":sta "
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url           - tulosta merkintä url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "kirjoitetaan list-tiedostoa medialle \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "tuntematon protokolla määrätty kohteelle %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "ei kirjoitettu mitään \"%s\":n listatiedostoon"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r              - tulosta versio ja julkaisu myös nimellä.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "tarkistetaan \"%s\" pubkey tiedostoa..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - tulosta merkintä vanhentaa: vanhentaa kaikki.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...tuotu avain %s pubkey-tiedostosta \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" on jo olemassa"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "en voi tuoda pubkey-tiedostoa \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "asennan %s \n"
+msgid "reading headers from medium \"%s\""
+msgstr "luetaan otsikkotietoja mediasta  \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Päivitettävä kohta puuttuu\n"
-"(yksi seuraavista: %s)\n"
+msgid "building hdlist [%s]"
+msgstr "rakennetaan hdlist-tiedostoa [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "yritetään pakottaa %s valinta "
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "rakenna hdlist-synthesis-tiedosto medialle \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "en voi poistaa pakettia %s "
+msgid "found %d headers in cache"
+msgstr "välimuistista löytyi %d otsikkokenttää"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "ongelmia luettaessa synthesis-tiedostoa medialle \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "poistetaan %d ylimääräisiä otsikkotietoja välimuistista"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Poistettava kohta puuttuu\n"
-"(yksi seuraavista: %s)\n"
+msgid "mounting %s"
+msgstr "liitän %s:n"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a              - valitse kaikki mediat.\n"
+msgid "unmounting %s"
+msgstr "irrotetaan liitos %s "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Allekirjoitus puuttuu (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "muutettiin %s kohdetta tiedostossa depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "ei kohteita muutettu tiedostossa depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel      - urpmi jaettu yli koneita aliaksella.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "haetaan rpm tiedostoa [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "ei oikeuksia rpm-tiedostoon [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (K/e) "
+msgid "unable to register rpm file"
+msgstr "rpm tiedoston rekisteröinti ei onnistunut"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --[group]       - rajoita annettuun ryhmään.\n"
+msgid "error registering local packages"
+msgstr "virhe rekisteröitäessä paikalliset paketit"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" yrittää käyttää jo käytössä olevaa listaa, media ohitettu"
+msgid "no package named %s"
+msgstr "ei pakettia nimeltä %s "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "väärin muodostettu syöte: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Seuraavat paketit sisältävät %s: %s "
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "paketin %s poistaminen rikkoo järjestelmäsi"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "löytyy useita paketteja joilla on sama rpm tiedostonimi \"%s\" "
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - listaa käytettävissä olevat mediat.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "en voi tulkita [%s] oikein arvolla \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Joitakin haluttuja paketteja ei voida asentaa:\n"
-"%s "
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Asennetaan pakettia `%s' ( %s / %s )..."
+"media \"%s\" käyttää virheellistä list-tiedostoa:\n"
+"  peilipalvelin ei todennäköisesti ole ajan tasalla, kokeillaan "
+"vaihtoehtoista tapaa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ei kohteita muutettu tiedostossa depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "media \"%s\" ei määritä yhtäkään kohdetta rpm-tiedostoille"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src   - asenna ainoastaan lähdekoodipaketit (ei binäärejä).\n"
+msgid "package %s is not found."
+msgstr "pakettia %s ei löytynyt."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl          - käytä curl:a etätiedostojen hakemiseen.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-tietokanta lukittu"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e              - sisällytä perl-koodia suoraan 'perl -e'.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "mediaa \"%s\" ei ole valittu"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Hyväksytkö?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "hajanainen list tiedosto kohteelle \"%s\", media ohitettu"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"hajanainen media \"%s\" merkitty siirrettäväksi, vaikkei oikeastaan ole"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...hakeminen valmis"
+msgid "unable to access medium \"%s\""
+msgstr "mediaa \"%s\" ei voitu käyttää"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "lisätään pakettia %s (id=%d, eid=%d, päivitys=%d, tiedosto=%s)"
+msgid "malformed input: [%s]"
+msgstr "väärin muodostettu syöte: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "ohitetaan paketti %s "
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "haetaan rpm tiedostoja medialle \"%s\" ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Virheellinen allekirjoitus (%s)"
+msgid "Preparing..."
+msgstr "Valmistellaan..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
+msgid "using process %d for executing transaction"
+msgstr "käytetään prosessia %d tehtävän suorittamiseen"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versio %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
-"mukaisesti.\n"
-"\n"
-"käyttö:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "en voi tulkita [%s] oikein arvolla \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia  - älä käytä seuraava(t) media(t) pilkulla erotettuina.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "mahdotonta määrittää tämän hdlist tiedoston [%s] mediaa"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "hdlist-tiedostoa \"%s\" ei voida tulkata"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "luotiin tapahtuma asennukselle %s (poisto=%d, asennus=%d, päivitys=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
+msgid "unable to create transaction"
+msgstr "tapahtumaa ei voida luoda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ristiriidan takia %s kanssa"
+msgid "removing package %s"
+msgstr "poistetaan paketti %s "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "poistetaan %d ylimääräisiä otsikkotietoja välimuistista"
+msgid "unable to remove package %s"
+msgstr "en voi poistaa pakettia %s "
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida päivittää\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "lisätään pakettia %s (id=%d, eid=%d, päivitys=%d, tiedosto=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
+msgid "unable to install package %s"
+msgstr "en voi asentaa pakettia %s "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuaalinen media \"%s\" ei ole paikallinen, media ohitettu"
+msgid "due to missing %s"
+msgstr "puuttuvan %s takia"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Valmistellaan..."
+msgid "due to unsatisfied %s"
+msgstr "täyttämättömän %s takia"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                  - oletus on %s.\n"
+msgid "trying to promote %s"
+msgstr "yritetään pakottaa %s valinta "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "käytetään erillistä siirrettävää laitetta [%s] kohteelle \"%s\""
+msgid "in order to keep %s"
+msgstr "pitääkseni %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe      - älä yritä etsiä ja käyttää synthesis- tai hdlist-"
-"tiedostoa.\n"
+msgid "in order to install %s"
+msgstr "asentaakseni %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P              - älä etsi 'tarjoaa' tiedoista paketin löytämiseksi.\n"
+msgid "due to conflicts with %s"
+msgstr "ristiriidan takia %s kanssa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] kopiointi epäonnistui (md5sum ei täsmää)"
+msgid "unrequested"
+msgstr "ei pyydetty"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta.\n"
-"                    Tämä sallii etsiminen jakelusta.\n"
+msgid "Invalid signature (%s)"
+msgstr "Virheellinen allekirjoitus (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"käyttö: %s [optiot]\n"
-"jossa [optiot] ovat:\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Virheellinen avain-ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean         - poista rpm paketti välimuistista ennen muita "
-"tapahtumia.\n"
+msgid "Missing signature (%s)"
+msgstr "Allekirjoitus puuttuu (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nimeä \"%s\" ei voida käyttää nimeämättömälle medialle, koska se on jo "
-"käytössä"
+msgid "bad proxy declaration on command line\n"
+msgstr "virheellinen välityspalvelinmääritys komentorivissä\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - tulosta merkintä ristiriita: kaikki ristiriidat.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuaalisella medialla \"%s\" pitäisi olla kunnollinen lähde-hdlist tai -"
-"synthesis, media ohitettu"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -927,1096 +830,1239 @@ msgstr ""
 "\n"
 "käyttö:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help          - tulosta tämä viesti.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto          - valitse automaattisesti paketit tarvittaessa.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"käyttö: urpmi.addmedia [valitsimet] <nimi> <url> [with "
-"<relaatiivisen_polun_kanssa>]\n"
-"missä <url> on yksi seuraavista:\n"
-"       file://<polku>\n"
-"       ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku> with <hdlist-"
-"tiedoston relatiivinen nimi>\n"
-"       ftp://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
-"       http://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
-"       removable://<polku>\n"
-"\n"
-"ja [valitsimet] ovat\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test          - varmista että asennusta voidaan hoitaa oikein.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopioidaan lähteen \"%s\" hdlist-tiedostoa (tai synthesis)..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force         - pakottaa asennuksen vaikka joitakin paketteja puuttuu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "... kopiointi valmis"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel      - urpmi jaettu yli koneita aliaksella.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "en voi käyttää rinnakkais optiota \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root          - käytä toinen juuri rpm asennukselle.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"media \"%s\" käyttää virheellistä list-tiedostoa:\n"
-"  peilipalvelin ei todennäköisesti ole ajan tasalla, kokeillaan "
-"vaihtoehtoista tapaa"
+"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
+"                    asennettaessa chroot käyttäen --root optiota.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "en voi käyttää ensimmäistä asennusmediaa"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v              - yksityiskohtainen tyyli.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuaalisen median on oltava paikallinen"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a              - valitse kaikki lausekkeeseen täsmäävät.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "virhe rekisteröitäessä paikalliset paketit"
+msgid "unknown packages"
+msgstr "tuntemattomia paketteja "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate    - rajoita latausnopeutta.\n"
+msgid "unknown package"
+msgstr "tuntematon paketti"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "löydettiin etsitty hdlist- tai synthesis-tiedosto nimellä %s"
+msgid "removing package %s will break your system"
+msgstr "paketin %s poistaminen rikkoo järjestelmäsi"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "lähteen hdlistin (tai synteesin) noutaminen epäonnistui"
+msgid "Nothing to remove"
+msgstr "Ei mitään poistettavissa"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "rpm-tiedostoja ei löytynyt paikasta [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ei kirjoitettu mitään \"%s\":n listatiedostoon"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+msgid " (y/N) "
+msgstr " (k/E) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "removing %s"
+msgstr "poistetaan %s "
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "Poistaminen epäonnistui"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"lasketaan md5sum olemassaolevalle lähde hdlist tai synthesis-tiedostolle"
+"urpmf 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"
 
-#: ../urpmq:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - täydellinen tuloste poistettavasta paketista.\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "unable to install package %s"
-msgstr "en voi asentaa pakettia %s "
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media         - käytä ainoastaan seuraava(t) media(t) pilkuilla "
+"erotettuina.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia  - älä käytä seuraava(t) media(t) pilkulla erotettuina.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force   - sallii pakettien asennuksen ilman\n"
-"                    riippuvuuksien ja ehytys-tarkistusta.\n"
+"  --sortmedia     - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
+"mukaan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Tallenna tiedosto"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
+"sijasta.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ei voida lukea rpm-tiedostoa \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose       - yksityiskohtainen tyyli.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "asetustiedostoon [%s] ei voitu kirjoittaa "
+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 (oletus jos ei merkintä \n"
+"                    annettu komentorivissä, ei yhteensopiva interaktiivisen\n"
+"                    tilan kanssa).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a              - valitse kaikki lausekkeeseen täsmäävät.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - älä tulosta identtisiä rivejä.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Virheellinen avain-ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - tulosta kaikki merkinnät.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force         - pakottaa asennuksen vaikka joitakin paketteja puuttuu.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - tulosta merkintä ryhmä: ryhmä.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "hakemiston nimeä ei voida noutaa siirrettävälle medialle \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - tulosta merkintä koko: koko.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch         - tulosta merkintä aikakausi: aikakausi.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
-"sijasta.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - tulosta merkintä yhteenveto: yhteenveto.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key     - pakota gpg avaimen päivitys.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - tulosta merkintä kuvaus: kuvaus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist:in relatiivinen polku> puuttuu\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm     - tulosta merkintä lähdekoodi-rpm: lähdekoodi-rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager      - tulosta merkintä paketoija: paketoija.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "ei pyydetty"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost     - tulosta merkintä käännöskone: käännöskone.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ei oikeuksia rpm-tiedostoon [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url           - tulosta merkintä url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - tulosta merkintä tiedostot: kaikki tiedostot.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - tulosta merkintä tarjoaa: kaikki tarjoaa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "en voi tulkata \"%s\" tiedostossa [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - tulosta merkintä tarvitsee: kaikki tarvitsee.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Haluatko jatkaa asennusta?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - tulosta merkintä tiedostot: kaikki tiedostot.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm-tiedostoa [%s] ei voitu lukea medialta \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - tulosta merkintä ristiriita: kaikki ristiriidat.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - tulosta merkintä vanhentaa: vanhentaa kaikki.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
-"                    asennettaessa chroot käyttäen --root optiota.\n"
+"  --env           - käytä määrättyä ympäristöä (yleensä virhe-\n"
+"                    raportti).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "rakenna hdlist-synthesis-tiedosto medialle \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i              - jätä huomiotta isojen/pienten kirjasinten erottelu \n"
+"                    hakuehdoissa.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i              - tulosta hyödyllistä tietoa ihmisen luettavassa "
-"muodossa.\n"
+"  -f              - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version       - käytä määritettyä jakeluversiota, oletuksena otetaan\n"
-"                    asennetusta mandrake-release paketin versiosta.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e              - sisällytä perl-koodia suoraan 'perl -e'.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from          - käytä määritettyä peilipalvelinten listan osoitetta, "
-"oletus:\n"
-"                    %s\n"
+"  -a              - binäärinen AND operaattori, oikea jos molemmat "
+"lausekkeet\n"
+"                    ovat oikeat.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
-"                    asennettaessa chroot käyttäen --root optiota.\n"
+"  -o              - binäärinen OR operaattori, oikea jos yksi lausekkeista\n"
+"                    on oikea.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !               - binäärinen NOT, oikea jos lauseke on väärä.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (               - vasen sulkumerkki lauseke-ryhmän avaamiseen.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )               - oikea sulkumerkki lauseke-ryhmän sulkemiseen.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
-"virheraportille tai poista sitä."
+"takaisinkutsu on:\n"
+"%s \n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "irrotetaan liitos %s "
+msgid "using specific environment on %s\n"
+msgstr "käytetään määrättyä ympäristö kohteessa %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% valmis, nopeus = %s "
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versio %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
+"mukaisesti.\n"
+"\n"
+"käyttö:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "uudelleenkäynnistetään urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
+"sijasta.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "tutkitaan synteesitiedostoa [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select   - valitse automaattisesti päivitettävät paketit.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Yritä asentaa pakolla (--force)? (k/E) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall  - älä koskaan kysy paketin poistosta, keskeytä asennus.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "... kopiointi epäonnistui"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep          - jätä olemassaolevat paketit jos mahdollista, hylkää\n"
+"                    paketit joiden asentaminen poistaisi muita.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "en voi käyttää media \"%s\" hdlist tiedosto, media ohitetaan"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level   - hajoita pieniin tapahtumiin mikäli enemmän kuin annettu\n"
+"                    pakettimäärä aiotaan asentaa tai päivittää,\n"
+"                    oletus on %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q              - hiljainen tyyli.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length  - pienen tapahtuman pituus, oletus on %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose       - yksityiskohtainen tyyli.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy         - käytä epätarkka haku (sama kuin -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources       - listaa kaikki lähdekoodipaketit ennen hakeminen.\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src           - seuraava paketti on lähdekoodi-paketti (sama kuin -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers       - purkaa otsikkotiedot urpmi tietokannan pakettilistasta\n"
-"                    näytölle (ainoastaan pääkäyttäjänä).\n"
+"  --install-src   - asenna ainoastaan lähdekoodipaketit (ei binäärejä).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "tuntemattomia paketteja "
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean         - poista rpm paketti välimuistista ennen muita "
+"tapahtumia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "valitaan useampi media: %s "
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean       - pidä käyttämätön rpm paketti välimuistissa.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f              - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
+"  --allow-nodeps  - sallii pakettien asennuksen ilman\n"
+"                    riippuvuuksien tarkistusta.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "tiedosto [%s] on jo käytössä samassa mediassa \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force   - sallii pakettien asennuksen ilman\n"
+"                    riippuvuuksien ja ehytys-tarkistusta.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätääksesi median)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
+"                    asennettaessa chroot käyttäen --root optiota.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kohteelle \"%s\" ei löytynyt listatiedostoa, media ohitettu"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget          - käytä wget etätiedostojen hakemiseen.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "  -h|--help       - tulosta tämä viesti.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl          - käytä curl:a etätiedostojen hakemiseen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "rinnakkais-käsittelijä löydetty noodeille: %s "
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate    - rajoita latausnopeutta.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"takaisinkutsu on:\n"
-"%s \n"
+"  --resume        - jatka osittain haettujen tiedostojen hakeminen\n"
+"                    (--no-resume poistaa käytöstä, vakiona ei käytössä).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -R              - käänteinen etsiminen 'vaatii' tiedoista paketeissa.\n"
+"  --proxy         - käytä määrättyä HTTP-välityspalvelinta, porttinumeron\n"
+"                    oletetaan olevan 1080 (muodossa <välityspalvelin [:"
+"portti]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf 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"
+"  --proxy-user    - määrittele käyttäjä ja salasana välityspalvelimen\n"
+"                    todentamisessa (muodossa <käyttäjä:salasana>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - jätä merkintänimi tulostamatta (oletus jos ei merkintä \n"
-"                    annettu komentorivissä, ei yhteensopiva interaktiivisen\n"
-"                    tilan kanssa).\n"
+"  --bug           - kirjoittaa virheraportin hakemistoon joka määritellään\n"
+"                    seuraavassa argumentissa.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - älä tulosta identtisiä rivejä.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X             - käytä X käyttöliittymää.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis ei voida käyttää ---media, --excludemedia, --sortmedia, --update "
-"tai --parallel kanssa"
+"  --best-output   - valitse paras käyttöliittymä ympäristön mukaan:\n"
+"                    X tai teksti tilassa.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch          - käytä määritettyä arkkitehtuuria, oletuksena on "
-"asennetun\n"
-"                    mandrake-release paketin arkkitehtuuri.\n"
+"  --verify-rpm    - varmista rpm allekirjoitusta ennen asennusta\n"
+"                    (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Sopiiko tämä?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
+"  --excludepath   - jätä asentamatta seuraaviin hakemistoihin\n"
+"                    (hakemistot pikuilla erotettuna)\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs   - jätä dokumentaatio pois.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --synthesis     - käytä annettua synthesis-tiedostoa urpmi tietokannan "
-"sijasta.\n"
+"  -a              - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "tutkitaan rinnakkaiskäsittelijän tiedostossa [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p              - sallii etsimisen 'tarjoaa' tiedoista paketin "
+"löytämiseksi.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ei mitään poistettavissa"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P              - älä etsi 'tarjoaa' tiedoista paketin löytämiseksi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...tuotu avain %s pubkey-tiedostosta \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y              - käytä epätarkka haku (sama kuin --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "luetaan otsikkotietoja mediasta  \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s              - seuraava paketti on lähdekoodi paketti (sama kuin --"
+"src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d              - laajenna haku sisältämään pakettien riippuvuuksia.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q              - hiljainen tyyli.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug           - kirjoittaa virheraportin hakemistoon joka määritellään\n"
-"                    seuraavassa argumentissa.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot asennetaan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "media \"%s\" ei määritä yhtäkään kohdetta rpm-tiedostoille"
+msgid "Choose location to save file"
+msgstr "Valitse hakemisto johon tiedosto tallennetaan"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm     - tulosta merkintä lähdekoodi-rpm: lähdekoodi-rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mitä voidaan tehdä binääri rpm-tiedostolla kun käytetään --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ei voida kirjoittaa listatiedostoa \"%s\":sta "
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Olet valinnut lähdekoodipaketin:\n"
+"\n"
+"%s\n"
+"\n"
+"Luultavasti et halua asentaa sitä tietokoneellesi (asentaminen\n"
+"sallii sinua muokata lähdekoodia ja kääntää sitä).\n"
+"\n"
+"Mitä haluat tehdä?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - tulosta merkintä tarvitsee: kaikki tarvitsee.\n"
+msgid "Do nothing"
+msgstr "Ei mitään"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "yritettiin valita puuttuva media \"%s\""
+msgid "Yes, really install it"
+msgstr "Kyllä, haluan asentaa sitä"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - tulosta merkintä kuvaus: kuvaus.\n"
+msgid "Save file"
+msgstr "Tallenna tiedosto"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr " kopiointi epäonnistui"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Olet asentamassa seuraava ohjelmapaketti koneellesi:\n"
+"\n"
+"%s\n"
+"\n"
+"Halutessasi voit myös vain tallentaa sitä. Mitä haluat tehdå?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f              - pakota hdlist-tiedostojen luominen.\n"
+msgid "Install it"
+msgstr "Asenna sitä"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes voidaan ainoastaan käyttää --parallel kanssa"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Hakemisto [%s] on jo olemassa. Ole hyvä ja valitse toinen hakemisto "
+"virheraportille tai poista sitä."
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "hdlist tiedostoa ei löydetty medialle \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Hakemiston [%s] luominen virheraportille ei onnistu"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s              - seuraava paketti on lähdekoodi paketti (sama kuin --"
-"src).\n"
+msgid "Copying failed"
+msgstr " kopiointi epäonnistui"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "asennan %s "
+msgid "Only superuser is allowed to install packages"
+msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopioidaan \"%s\" tiedoston kuvausta"
+msgid "What is your choice? (1-%d) "
+msgstr "Mikä on valintasi? ( 1 - %d) : "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto          - valitse automaattisesti paketit tarvittaessa.\n"
+msgid "Package installation..."
+msgstr "Pakettia asennetaan..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Poistaminen epäonnistui"
+msgid "Initializing..."
+msgstr "Alustetaan..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual       - luo virtuaalinen media, joka on aina ajantasalla,\n"
-"                    vain file:// protokolla on mahdollinen.\n"
+"Joitakin haluttuja paketteja ei voida asentaa:\n"
+"%s "
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "pakettia %s ei löytynyt."
+msgid "do you agree ?"
+msgstr "Hyväksytkö?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "poistetaan mediaa \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
+"jotta toiset voidaan päivittää:\n"
+"%s \n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distrib -"
-"parametrin kanssa"
+"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
+"%s "
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
-msgstr "Peruuta"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Riippuvuuksien täyttämiseksi seuraavat %d paketit asennetaan (%d Mt)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --src           - seuraava paketti on lähdekoodi-paketti (sama kuin -s).\n"
+"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
+"%s \n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env           - käytä määrättyä ympäristöä (yleensä virhe-\n"
-"                    raportti).\n"
+msgid "unable to get source packages, aborting"
+msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia     - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
-"mukaan.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "mediaa \"%s\" ei voitu käyttää"
+msgid "Press Enter when ready..."
+msgstr "Paina Enter kun olet valmis..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "mediaa \"%s\" ei voida luoda\n"
+msgid "Downloading package `%s'..."
+msgstr "Ladataan pakettia `%s'..."
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - tulosta merkintä paketoija: paketoija.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config   - tulosta asetukset urpmi.addmedia muodossa.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% valmis, nopeus = %s "
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
 
-#: ../urpmi:1
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Haluatko jatkaa asennusta?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
+"Asennus epäonnistui, joitakin tiedostoja puuttuu:\n"
 "%s \n"
+"Sinun kannattaisi päivittää urpmi tietokanta"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog     - tulosta muutosloki.\n"
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ei voida käyttää median \"%s\" list-tiedostoa, media ohitetaan"
+msgid "distributing %s"
+msgstr "levitetään %s "
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )               - oikea sulkumerkki lauseke-ryhmän sulkemiseen.\n"
+msgid "installing %s"
+msgstr "asennan %s "
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "yhtäkään webfetch ei löydetty, tuetut ovat: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Asennetaan pakettia `%s' ( %s / %s )..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "tutkitaan hdlist-tiedostoa [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Yritä asentaa ilman riippuvuuksia? (k/E) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopioidaan hdlists-tiedostoa ..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Yritä asentaa pakolla (--force)? (k/E) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "kirjoitetaan list-tiedostoa medialle \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d asennustoiminnot epäonnistuivat"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"virtuaalisella medialla \"%s\" pitäisi olla kunnollinen url, media ohitettu"
+msgid "Installation is possible"
+msgstr "Asennus on mahdollinen"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost     - tulosta merkintä käännöskone: käännöskone.\n"
+msgid "Everything already installed"
+msgstr "Kaikki on jo asennettu"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Ei mitään"
+msgid "restarting urpmi"
+msgstr "uudelleenkäynnistetään urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"käyttö: urpmi.addmedia [valitsimet] <nimi> <url> [with "
+"<relaatiivisen_polun_kanssa>]\n"
+"missä <url> on yksi seuraavista:\n"
+"       file://<polku>\n"
+"       ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku> with <hdlist-"
+"tiedoston relatiivinen nimi>\n"
+"       ftp://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
+"       http://<kone>/<polku> with <hdlist-tiedoston relatiivinen nimi>\n"
+"       removable://<polku>\n"
+"\n"
+"ja [valitsimet] ovat\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "käytetään sidotut mediat rinnakkais tapaan: %s "
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update        - luo päivitysmediaa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "liitän %s:n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - yritä etsiä ja käyttää synthesis-tiedostoa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"mediaa \"%s\" ei voitu käyttää koska list-tiedosto on jo toisen median "
-"käytössä"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist  - yritä löytää ja käyttää hdlist-tiedostoa.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe      - älä yritä etsiä ja käyttää synthesis- tai hdlist-"
+"tiedostoa.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root          - käytä toinen juuri rpm asennukselle.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib       - luo automaattisesti kaikki mediat asennusmedioista\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s, aika-arvio = %s, nopeus = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX   - luo automaattisesti median XXX osan\n"
+"                    jakelusta, XXX voi olla 'main', 'contrib', 'updates'\n"
+"                    tai jotain muuta joka on jo määritetty ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "lasketaan md5sum haetulle lähde-hdlist tai -synthesis-tiedostolle"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from          - käytä määritettyä peilipalvelinten listan osoitetta, "
+"oletus:\n"
+"                    %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "en voi tuoda pubkey-tiedostoa \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version       - käytä määritettyä jakeluversiota, oletuksena otetaan\n"
+"                    asennetusta mandrake-release paketin versiosta.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall  - älä koskaan kysy paketin poistosta, keskeytä asennus.\n"
+"  --arch          - käytä määritettyä arkkitehtuuria, oletuksena on "
+"asennetun\n"
+"                    mandrake-release paketin arkkitehtuuri.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
+"  --virtual       - luo virtuaalinen media, joka on aina ajantasalla,\n"
+"                    vain file:// protokolla on mahdollinen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "haetaan lähteen hdlist (tai synthesis) kohteelta \"%s\""
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum     - poista tiedostojen MD5SUM tarkistusta.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g              - tulosta ryhmät myös nimellä.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c              - puhdista otsikkotietojen välimuistihakemisto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "mediaa \"%s\" ei ole valittu"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f              - pakota hdlist-tiedostojen luominen.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Vain pääkäyttäjä saa asentaa paketteja"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ei voida lisätä cooker jakelun päivityksiä\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "käytetään määrättyä ympäristö kohteessa %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "haen peilipalvelinlistaa kohteesta %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kohteelle \"%s\" ei löytynyt hdlist-tiedostoa, media ohitettu"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"ei tarvetta antaa <hdlist:in relatiivinen polku>-kohtaa --distrib -"
+"parametrin kanssa"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length  - pienen tapahtuman pituus, oletus on %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida päivittää\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (               - vasen sulkumerkki lauseke-ryhmän avaamiseen.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist:in relatiivinen polku> puuttuu\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "verkkomedian kohta `with' puuttuu\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a              - binäärinen AND operaattori, oikea jos molemmat "
-"lausekkeet\n"
-"                    ovat oikeat.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "mediaa \"%s\" ei voida luoda\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"ei voida käyttää mediaa \"%s\",\n"
-"tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
+"käyttö: urpmi.removemedia [-a] <nimi> ...\n"
+"jossa <nimi> on poistettavan median nimi.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - tulosta merkintä ryhmä: ryhmä.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a              - valitse kaikki mediat.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media         - käytä ainoastaan seuraava(t) media(t) pilkuilla "
-"erotettuina.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "tapahtumaa ei voida luoda"
+"\n"
+"tuntemattomat valitsimet '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "haetaan rpm tiedostoja medialle \"%s\" ..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään poistettavaa (käytä urpmi.addmedia lisätääksesi median)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Olet valinnut lähdekoodipaketin:\n"
-"\n"
-"%s\n"
-"\n"
-"Luultavasti et halua asentaa sitä tietokoneellesi (asentaminen\n"
-"sallii sinua muokata lähdekoodia ja kääntää sitä).\n"
-"\n"
-"Mitä haluat tehdä?"
+"Poistettava kohta puuttuu\n"
+"(yksi seuraavista: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "levitetään %s "
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"käyttö: urpmi.update [valitsimet] <nimi> ...\n"
+"jossa <nimi> on päivitettävän median nimi.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Asennus epäonnistui"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "kirjoitetaan asetustiedosto [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key     - pakota gpg avaimen päivitys.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a              - valitse kaikki ei-siirrettävät mediat.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch         - tulosta merkintä aikakausi: aikakausi.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm    - varmista rpm allekirjoitusta ennen asennusta\n"
-"                    (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
+"Päivitettävä kohta puuttuu\n"
+"(yksi seuraavista: %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 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"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - listaa käytettävissä olevat paketit.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - luo päivitysmediaa.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - listaa käytettävissä olevat mediat.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url      - listaa käytettävissä olevat mediat ja niiden polut.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y              - käytä epätarkka haku (sama kuin --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config   - tulosta asetukset urpmi.addmedia muodossa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "virheellinen hdlist kuvaus \"%s\" hdlists tiedostossa"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes    - listaa käytettävissä olevat noodit käytettäessä --"
+"parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "poistetaan %s "
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases  - listaa käytettävissä rinnakkais-aliakset.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX   - luo automaattisesti median XXX osan\n"
-"                    jakelusta, XXX voi olla 'main', 'contrib', 'updates'\n"
-"                    tai jotain muuta joka on jo määritetty ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - tulosta merkintä koko: koko.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "pitääkseni %s"
+"  --headers       - purkaa otsikkotiedot urpmi tietokannan pakettilistasta\n"
+"                    näytölle (ainoastaan pääkäyttäjänä).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "täyttämättömän %s takia"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources       - listaa kaikki lähdekoodipaketit ennen hakeminen.\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Pakettien automaattinen asennus...\n"
-"Lähetit pyynnön paketin %s asentamisesta\n"
+"  --use-distrib   - aseta urpmi automaattisesti jakelun puusta.\n"
+"                    Tämä sallii etsiminen jakelusta.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-tietokanta lukittu"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog     - tulosta muutosloki.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --resume        - jatka osittain haettujen tiedostojen hakeminen\n"
-"                    (--no-resume poistaa käytöstä, vakiona ei käytössä).\n"
+"  -d              - laajenna haku sisältämään pakettien riippuvuuksia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "tarkistetaan \"%s\" pubkey tiedostoa..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u              - poista paketti jos uudempi versio on jo asennettu.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum     - poista tiedostojen MD5SUM tarkistusta.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - täydellinen tuloste poistettavasta paketista.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "käytetään siirettävä laite kohteena \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr ""
+"  -R              - käänteinen etsiminen 'vaatii' tiedoista paketeissa.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Olet asentamassa seuraava ohjelmapaketti koneellesi:\n"
-"\n"
-"%s\n"
-"\n"
-"Halutessasi voit myös vain tallentaa sitä. Mitä haluat tehdå?"
+"  -i              - tulosta hyödyllistä tietoa ihmisen luettavassa "
+"muodossa.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy         - käytä epätarkka haku (sama kuin -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g              - tulosta ryhmät myös nimellä.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u              - poista paketti jos uudempi versio on jo asennettu.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r              - tulosta versio ja julkaisu myös nimellä.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist  - yritä löytää ja käyttää hdlist-tiedostoa.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l              - listaa paketissa olevia tiedostoja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "puuttuvan %s takia"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update        - käytä ainoastaan päivitysmediaa.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes voidaan ainoastaan käyttää --parallel kanssa"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"käyttö: urpmi.update [valitsimet] <nimi> ...\n"
-"jossa <nimi> on päivitettävän median nimi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "yritetään ohittaa olemassa olevaa mediaa \"%s\", vältetään"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test          - varmista että asennusta voidaan hoitaa oikein.\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Yksi seuraavista paketeista täytyy asentaa: %s : "
+
+#~ msgid ""
+#~ "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"
+#~ 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"
diff --git a/po/fr.po b/po/fr.po
index 65111907..a44f677c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-04 14:03+0200\n"
 "Last-Translator: Didier Hérisson <didier.herisson@angstrom.uu.se>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -48,1603 +48,1572 @@ msgstr "OoYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "installation de %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - créer automatiquement tous les médias à partir\n"
-"                   d'un média d'installation.\n"
+"Installation automatique des paquetages...\n"
+"Vous avez demandé l'installation du paquetage %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "impossible d'ouvrir la base de donnée rpm"
+msgid "Is this OK?"
+msgstr "Est-ce correct ?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - afficher ce message d'aide\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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 :"
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "désinstallation du paquetage %s"
+msgid " (Y/n) "
+msgstr " (O/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "« %s »"
+msgid "%s: command not found\n"
+msgstr "%s : commande non trouvée\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
-"Le mode « parallel » ne peut pas être utiliser avec le mode « use-distrib »"
+"usage : %s [options]\n"
+"où les [options] sont parmi\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Tout est déjà installé"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - afficher ce message d'aide\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [groupe]    - restreindre les résultats au groupe spécifié.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "Utilisation du processus %d pour exécuter la transaction"
+msgid "                    defaults is %s.\n"
+msgstr "                    le défaut en est %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocole inconnu défini pour %s"
+
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
-"  --provides     - afficher le champ « provides » : tous les apports.\n"
+"aucun programme de rapatriement de pages web trouvé, ceux supportés sont: %"
+"s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Que choisissez-vous ? (1-%d)"
+msgid "unable to handle protocol: %s"
+msgstr "impossible d'utiliser le protocole : %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d en-têtes trouvés dans le cache"
+msgid "syntax error in config file at line %s"
+msgstr "erreur de syntaxe dans le fichier de configuration à la ligne %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "il y a plusieurs paquetages avec le même nom de fichier « %s »"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "le média « %s » essaye d'utiliser un hdlist déjà utilisé, média ignoré"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"  --proxy-user   - spécifier l'utilisateur et le mot de passe pour \n"
-"                   l'authentification proxy (format <utilisateur:"
-"motdepasse>).\n"
+"le média « %s » essaye d'utiliser une liste déjà utilisée, média ignoré"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "seconde exécution pour calculer les dépendances\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"impossible de tenir compte de « %s » car la liste de fichiers est déjà "
+"utilisée par un autre média"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "récupération des fichiers rpm [%s]..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"impossible d'utiliser le nom « %s » pour le média non nommé car ce nom est "
+"déjà utilisé"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lister les alias parallèles disponibles.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"impossible de prendre en compte le média « %s » car il n'existe aucun "
+"fichier de liste [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...échec de la récupération : %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "impossible de déterminer le média de ce fichier hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "impossible de consulter le fichier de liste pour « %s »; média ignoré"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "impossible d'accéder au fichier hdlist de « %s »; média ignoré"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - opérateur binaire OU, vrai si une expression est vraie.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "impossible d'accéder au fichier de liste de « %s »; média ignoré"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Installation du paquetage..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "tentative d'ignorer le média existant « %s »; abandon"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "le nom du fichier rpm est invalide [%s]"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"le média virtuel « %s » ne devrait pas avoir de liste de fichier ou de "
+"hdlist, média ignoré"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Mauvaise déclaration de proxy en ligne de commande\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "le média virtuel « %s » devrait avoir une url claire, média ignoré"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transactions d'installation ont échoué"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "impossible de trouver le fichier hdlist pour « %s »; média ignoré"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"impossible d'accéder au premier média d'installation (pas de fichier "
-"Mandrake/base/hdlists)"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "impossible de trouver le fichier liste de « %s »; média ignoré"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Désolé, mauvais choix, veuillez réessayer\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fichier de liste incohérent pour « %s », média ignoré"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
-msgstr "Choisissez un emplacement pour enregistrer le fichier."
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "impossible de consulter le fichier de liste pour « %s »; média ignoré"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - afficher le champ « summary » : résumé.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "trop de points de montage pour le média amovible « %s »"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les paquetages suivants contiennent %s : %s"
+msgid "taking removable device as \"%s\""
+msgstr "périphérique amovible pris en tant que « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Install it"
-msgstr "L'installer"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utiliser l'interface graphique (X11)\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "impossible d'accéder au chemin du média amovible « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Un des paquetages suivants est nécessaire :"
+msgid "unable to write config file [%s]"
+msgstr "impossible d'écrire le fichier de configuration [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Pour satisfaire les dépendances, les paquetages suivants vont être "
-"désinstallés (%d Mo)"
+msgid "write config file [%s]"
+msgstr "écriture du fichier de configuration [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - choisir la meilleure interface en fonction de\n"
-"                   l'environnement : mode graphique ou textuel.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "téléchargement du paquetage %s"
+"Le mode « parallel » ne peut pas être utiliser avec le mode « use-distrib »"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Ce qui peut être fait avec les fichiers binaires rpm avec l'option --install-"
-"src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "impossible d'analyser « %s » dans le fichier [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - sélection automatique des paquetages à mettre à jour.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "examen du support distribué dans le fichier [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "pas de paquetage nommé %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "support distribué trouvé pour les noeuds : %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - sélectionne toutes les correspondances de la ligne de\n"
-"                   commande.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "utilisation du média associé pour le mode distribué : %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"L'installation a échoué, il manque des fichiers :\n"
-"%s\n"
-"Vous devriez mettre à jour votre base de données urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "impossible d'utiliser l'option distribuée « %s »"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Utilisation : urpmi.removemedia [-a] <nom> ...\n"
-"où <nom> est le nom du média à retirer.\n"
+"--synthesis ne peut pas être utilisé avec --media, --excludemedia, --"
+"sortmedia, --update ou --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"La mise à jour ne peut pas continuer car les paquetages suivants\n"
-"doivent être désinstallés :\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "examen de la liste de synthèse [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "directive « with » manquante pour les médias en réseau\n"
+msgid "examining hdlist file [%s]"
+msgstr "examen du fichier hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - liste les fichiers d'un paquetage.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "le média virtuel « %s » n'est pas local, média ignoré"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "paquetage inconnu"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problème de lecture du fichier hdlist ou de synthèse du média « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "L'installation est possible"
+msgid "performing second pass to compute dependencies\n"
+msgstr "seconde exécution pour calculer les dépendances\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
-"désinstallés :\n"
-"%s"
+msgid "skipping package %s"
+msgstr "paquetage %s ignoré"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
-"installés (%d Mo)"
+msgid "would install instead of upgrade package %s"
+msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"impossible de prendre en compte le média « %s » car il n'existe aucun "
-"fichier de liste [%s]"
+msgid "unable to open rpmdb"
+msgstr "impossible d'ouvrir la base de donnée rpm"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (o/N) "
+msgid "medium \"%s\" already exists"
+msgstr "le média « %s » existe déjà"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
-"Ne peut ajouter des mises à jour sur une distribution "
-"« cooker » (« betas »)\n"
+msgid "virtual medium need to be local"
+msgstr "Le média virtuel doit être local"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode verbeux.\n"
+msgid "added medium %s"
+msgstr "média %s ajouté"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initialisation..."
+msgid "unable to access first installation medium"
+msgstr "impossible d'accéder au premier média d'installation"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - montrer tous les paquetages disponibles.\n"
+msgid "copying hdlists file..."
+msgstr "copie du fichier hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - afficher tous les champs.\n"
+msgid "...copying failed"
+msgstr "...copie impossible"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "média incohérent « %s », marqué amovible mais sans l'être réellement"
+msgid "...copying done"
+msgstr "...copie effectuée"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"le média virtuel « %s » ne devrait pas avoir de liste de fichier ou de "
-"hdlist, média ignoré"
+"impossible d'accéder au premier média d'installation (pas de fichier "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"calcul de la somme de contrôle MD5sum du fichier hdlist copié (ou de sa "
-"synthèse)"
+msgid "retrieving hdlists file..."
+msgstr "récupération du fichier hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-"  --excludepath  - exclure les chemins indiqués, séparés par des virgules.\n"
+msgid "...retrieving done"
+msgstr "...récupération effectuée"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
+msgid "...retrieving failed: %s"
+msgstr "...échec de la récupération : %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"option inconnue '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "description « %s »  invalide dans le fichier des hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - découper en petites transactions si plus du nombre "
-"spécifié\n"
-"                   de paquetages doivent être installés ou mis à jour.\n"
-"                   (%d par défaut).\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "essai de sélection du média inexistant « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problème de lecture du fichier hdlist ou de synthèse du média « %s »"
+msgid "selecting multiple media: %s"
+msgstr "sélection de plusieurs médias : %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
+msgid "\"%s\""
+msgstr "« %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "enlever le média « %s »"
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - cherche dans les apports pour trouver le paquetage.\n"
+"Impossible d'accéder au média « %s »,\n"
+"cela peut arriver si vous avez effectué un montage manuel lors de la "
+"création du média."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes   - montrer tous les noeuds disponibles en.\n"
-"                   utilisant --parallel.\n"
+"le média virtuel « %s » devrait avoir un fichier hdlist ou de synthèse "
+"valide, média ignoré"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "création du fichier hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "copie du fichier description de « %s »"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  --keep         - conserve les paquetages existants si possible, rejette "
-"les paquetages demandés\n"
-"                   qui nécessitent des désinstallations.\n"
+"calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
+"existant"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "examen du fichier de somme de contrôle MD5sum"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s : commande non trouvée\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copie du hdlist source (ou synthèse) de « %s »..."
 
-# c-format
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "impossible de référencer le fichier rpm"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
+"La copie de [%s] a échoué ( Le fichier est si petit que c'en est suspect )"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
-"  --allow-nodeps - permet à l'utilisateur qui le demande d'installer\n"
-"                   des paquetages sans vérifier les dépendances.\n"
+"calcul de la somme de contrôle MD5sum du fichier hdlist copié (ou de sa "
+"synthèse)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "impossible d'utiliser le protocole : %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr ""
+"la copie de [%s] a échoué ( disparité entre les sommes de contrôle md5sum )"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "récupération du fichier hdlists..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problème de lecture du fichier de synthèse du média « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Oui, l'installer vraiment."
+msgid "reading rpm files from [%s]"
+msgstr "lecture des fichiers rpm à partir de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "média %s ajouté"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "impossible de lire les fichiers rpm à partir de [%s] : %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - garder les rpm non utilisés dans le cache.\n"
+msgid "no rpm files found from [%s]"
+msgstr "pas de fichier rpm trouvé pour [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "récupération du hdlist source (ou synthèse) de « %s »..."
+
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "hdlist source (ou synthèse) potentiel trouvé en tant que %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"Transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
-"%d)"
+"calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
+"téléchargé"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "La somme de contrôle MD5sum ne correspond pas"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "erreur de syntaxe dans le fichier de configuration à la ligne %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "la récupération du hdlist source (ou synthèse) a échoué"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  les noms ou les fichiers rpm donnés en ligne de commande seront "
-"installés.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "pas de fichier hdlist trouvé pour le média « %s »"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - utiliser le proxy HTTP indiqué, le n° de port \n"
-"                   étant 1080 à défaut d'indication (format <proxy[:port]"
-">).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "le fichier [%s] est déjà utilisé sur le même support « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "pour installer le paquetage %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "impossible d'analyser le fichier hdlist de « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entrées déplacées dans la depslist"
+msgid "unable to write list file of \"%s\""
+msgstr "impossible d'écrire le fichier de liste « %s »"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignorer la distinction de case.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "Écriture de la liste des fichiers pour le média « %s »"
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, 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"
+msgid "nothing written in list file for \"%s\""
+msgstr "rien n'a été écrit dans le fichier de liste pour « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "examen du fichier de la clé publique de « %s »..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "récupération des mirroirs depuis %s ..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...clé %s importée à partir du fichier de la clé publique de « %s »"
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - afficher le champ url : url.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "impossible d'importer le fichier de la clé publique de « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocole inconnu défini pour %s"
+msgid "reading headers from medium \"%s\""
+msgstr "lecture des en-têtes du média « %s »"
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - affiche la version détaillée ainsi que le nom.\n"
+msgid "building hdlist [%s]"
+msgstr "création du fichier hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - afficher le champ « obsoletes » : toutes les "
-"obsolescences.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "fichier de synthèse créé pour le média « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "le média « %s » existe déjà"
+msgid "found %d headers in cache"
+msgstr "%d en-têtes trouvés dans le cache"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "installation de %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "destruction de %d en-têtes obsolètes dans le cache"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"l'entrée à mettre à jour est manquante\n"
-"(un parmi de %s)\n"
+msgid "mounting %s"
+msgstr "montage de %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "Tentative de promouvoir %s"
+msgid "unmounting %s"
+msgstr "démontage de %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "impossible d'enlever le paquetage %s"
+msgid "relocated %s entries in depslist"
+msgstr "%s entrées déplacées dans la depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problème de lecture du fichier de synthèse du média « %s »"
+msgid "no entries relocated in depslist"
+msgstr "pas d'entrée déplacée dans la depslist"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"L'entrée à retirer est manquante\n"
-" (l'une parmi %s)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "le nom du fichier rpm est invalide [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - sélectionne toutes les medias\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "récupération des fichiers rpm [%s]..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Signature absente (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "impossible d'accéder au fichier rpm [%s]"
 
-#: ../urpm.pm:1
+# c-format
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "impossible de lire les fichiers rpm à partir de [%s] : %s"
+msgid "unable to register rpm file"
+msgstr "impossible de référencer le fichier rpm"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribué sur plusieurs machines d'alias.\n"
+msgid "error registering local packages"
+msgstr "erreur lors de l'inscription des paquetages locaux"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
-"La copie de [%s] a échoué ( Le fichier est si petit que c'en est suspect )"
+msgid "no package named %s"
+msgstr "pas de paquetage nommé %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ne rafraîchir que les médias de mise à jour.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Les paquetages suivants contiennent %s : %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr " (O/n) "
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "il y a plusieurs paquetages avec le même nom de fichier « %s »"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [groupe]    - restreindre les résultats au groupe spécifié.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "impossible d'analyser correctement [%s] pour la valeur « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"le média « %s » essaye d'utiliser une liste déjà utilisée, média ignoré"
+"Le média « %s » utilise un fichier de liste invalide :\n"
+"  le site mirroir n'est probablement pas à jour. Essai d'une méthode "
+"alternative en cours..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrée incorrecte : [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "Le média « %s » ne définit aucun emplacement pour les fichiers rpm"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "La désinstallation du paquetage %s rendra votre système instable"
+msgid "package %s is not found."
+msgstr "paquetage %s non trouvé"
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - montrer tous les médias disponibles.\n"
+msgid "urpmi database locked"
+msgstr "base de données urpmi vérouillée"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Certains paquetages demandés ne peuvent pas être installés :\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "le média « %s » n'est pas sélectionné"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installation du paquetage « %s » (%s/%s)..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "impossible de lire le fichier rpm [%s] depuis le média « %s »"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "pas d'entrée déplacée dans la depslist"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "média incohérent « %s », marqué amovible mais sans l'être réellement"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - n'installer que les paquetages-source (pas les "
-"binaires).\n"
+msgid "unable to access medium \"%s\""
+msgstr "impossible d'accéder au média « %s »"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - utiliser curl pour récupérer les fichiers distants.\n"
+msgid "malformed input: [%s]"
+msgstr "entrée incorrecte : [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclure du code perl directement.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "récupération des fichiers rpm à partir de « %s »..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "Êtes-vous d'accord ?"
+msgid "Preparing..."
+msgstr "Préparation..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fichier de liste incohérent pour « %s », média ignoré"
+msgid "using process %d for executing transaction"
+msgstr "Utilisation du processus %d pour exécuter la transaction"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...récupération effectuée"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"Transaction créée pour l'installation sur %s (remove=%d, install=%d, upgrade="
+"%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "ajout du paquetage %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "unable to create transaction"
+msgstr "impossible de créer la transaction"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "paquetage %s ignoré"
+msgid "removing package %s"
+msgstr "désinstallation du paquetage %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Signature incorrecte (%s)"
+msgid "unable to remove package %s"
+msgstr "impossible d'enlever le paquetage %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  les noms ou fichiers rpm indiqués sur la ligne de commandes sont "
-"intérrogés.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "ajout du paquetage %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 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"
+msgid "unable to install package %s"
+msgstr "impossible d'installer le paquetage %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "impossible d'analyser correctement [%s] pour la valeur « %s »"
+msgid "due to missing %s"
+msgstr "en raison du manque de %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ne pas utiliser les média spécifiés (séparés\n"
-"                   par des virgules).\n"
+msgid "due to unsatisfied %s"
+msgstr "car %s  est non satisfait"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "impossible de déterminer le média de ce fichier hdlist [%s]"
+msgid "trying to promote %s"
+msgstr "Tentative de promouvoir %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "impossible d'analyser le fichier hdlist de « %s »"
+msgid "in order to keep %s"
+msgstr "afin de garder %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "le média « %s » essaye d'utiliser un hdlist déjà utilisé, média ignoré"
+msgid "in order to install %s"
+msgstr "pour installer le paquetage %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "en raison de conflit avec %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "destruction de %d en-têtes obsolètes dans le cache"
+msgid "unrequested"
+msgstr "non demandé"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "impossible de mettre à jour le média « %s »\n"
+msgid "Invalid signature (%s)"
+msgstr "Signature incorrecte (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "Identifiant de clef incorrect (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "le média virtuel « %s » n'est pas local, média ignoré"
+msgid "Missing signature (%s)"
+msgstr "Signature absente (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "Préparation..."
+msgid "bad proxy declaration on command line\n"
+msgstr "Mauvaise déclaration de proxy en ligne de commande\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    le défaut en est %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Désolé, mauvais choix, veuillez réessayer\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     - ne pas essayer de trouver un fichier hdlist\n"
-"                   ou de synthèse.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 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"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - ne pas chercher dans les apports pour trouver un "
-"paquetage.\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - afficher ce message d'aide\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"la copie de [%s] a échoué ( disparité entre les sommes de contrôle md5sum )"
+"  --auto         - sélectionner automatiquement un paquetage parmi les "
+"choix\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
-"                   distribution, permettant d'interroger une distribution.\n"
+"  --test         - vérifier si l'installation fonctionne correctement.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"usage : %s [options]\n"
-"où les [options] sont parmi\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"  --clean        - enlever tous les rpm du cache avant toute opération.\n"
+"  --force        - forcer l'invocation même si certains paquetages "
+"n'existent\n"
+"                   pas.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"impossible d'utiliser le nom « %s » pour le média non nommé car ce nom est "
-"déjà utilisé"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribué sur plusieurs machines d'alias.\n"
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
-"  --conflicts    - afficher le champ « conflicts » : tous les conflits.\n"
+"  --root         - utiliser un autre répertoire racine pour l'installation "
+"du rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"le média virtuel « %s » devrait avoir un fichier hdlist ou de synthèse "
-"valide, média ignoré"
+"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
+"                   distribution, utile pour (dés)installer un chroot avec\n"
+"                   l'option --root.\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999, 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"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode verbeux.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path> with <relative filename of hdlist>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"Utilisation : urpmi.addmedia [options] <nom> <url> [with <chemin relatif>]\n"
-"où <url> est l'un de :\n"
-"       file://<chemin> with <nom de fichier relatif de hdlist>\n"
-"       ftp://<utilisateur>:<mot de passe>@<hôte>/<chemin> with <nom de "
-"fichier relatif de hdlist>\n"
-"       ftp://<hôte>/<chemin> with <nom de fichier relatif de hdlist>\n"
-"       http://<host>/<path> with <nom de fichier relatif de hdlist>\n"
-"       removable://<chemin>\n"
-"\n"
-"et [options] sont issues de\n"
+"  -a             - sélectionne toutes les paquetages correspondants à\n"
+"                   l'expression\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copie du hdlist source (ou synthèse) de « %s »..."
+msgid "unknown packages"
+msgstr "paquetages inconnus"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...copie effectuée"
+msgid "unknown package"
+msgstr "paquetage inconnu"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "impossible d'utiliser l'option distribuée « %s »"
+msgid "removing package %s will break your system"
+msgstr "La désinstallation du paquetage %s rendra votre système instable"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"Le média « %s » utilise un fichier de liste invalide :\n"
-"  le site mirroir n'est probablement pas à jour. Essai d'une méthode "
-"alternative en cours..."
+msgid "Nothing to remove"
+msgstr "Rien à désinstaller"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "impossible d'accéder au premier média d'installation"
+msgid "Checking to remove the following packages"
+msgstr "Vérification pour la désinstallation des paquetages suivants"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "Le média virtuel doit être local"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être "
+"désinstallés (%d Mo)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "erreur lors de l'inscription des paquetages locaux"
+msgid " (y/N) "
+msgstr " (o/N) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limiter la vitesse de téléchargement.\n"
+msgid "removing %s"
+msgstr "désinstallation de %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "hdlist source (ou synthèse) potentiel trouvé en tant que %s"
+msgid "Removing failed"
+msgstr "Échec de la désinstallation"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "la récupération du hdlist source (ou synthèse) a échoué"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 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"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "pas de fichier rpm trouvé pour [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - n'utiliser que les média de mise à jour.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "rien n'a été écrit dans le fichier de liste pour « %s »"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - utiliser seulement les média listés (séparés par des\n"
+"                   virgules).\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Les paquetages suivants ont des signatures non valides"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ne pas utiliser les média spécifiés (séparés\n"
+"                   par des virgules).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
-"existant"
+"  --sortmedia    - trier les média selon des sous-chaînes (séparées\n"
+"                   par des virgules).\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  -c             - sortie sur la ligne de commande avec les\n"
-"                   noms des paquetages à désinstaller.\n"
+"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
+"                   de données urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "impossible d'installer le paquetage %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode verbeux.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - autoriser l'utilisateur qui le demande à installer les\n"
-"                   paquetages sans vérifier ni les dépendances ni "
-"l'intégrité.\n"
+"  --quiet        - ne pas afficher le nom des champs (actif par défaut,\n"
+"                   incompatible avec le mode interactif).\n"
 
-#: ../urpmi:1
+#: ../urpmf:41
 #, c-format
-msgid "Save file"
-msgstr "Enregistrer le fichier"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - afficher tous les champs.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "impossible d'écrire le fichier de configuration [%s]"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - afficher le champ « group » : groupe.\n"
 
-#: ../urpme:1
+#: ../urpmf:44
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - sélectionne toutes les paquetages correspondants à\n"
-"                   l'expression\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - afficher le champ « size » : taille.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Identifiant de clef incorrect (%s)"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - afficher le champ « epoch » : série.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - forcer l'invocation même si certains paquetages "
-"n'existent\n"
-"                   pas.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - afficher le champ « summary » : résumé.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "impossible d'accéder au chemin du média amovible « %s »"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - afficher le champ « description » : description.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - essayer de trouver et d'utiliser un fichier de "
-"synthèse.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - afficher le champ « sourcerpm » : source rpm.\n"
 
-#: ../urpmi:1
+#: ../urpmf:49
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
-"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
-"                   de données urpmi.\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
+"  --packager     - afficher le champ « packager » : créateur du paquetage.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<chemin relatif de hdlist> manquant\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - afficher le champ « buildhost » : build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Vérification pour la désinstallation des paquetages suivants"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - afficher le champ url : url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "non demandé"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - afficher le champ « provides » : tous les apports.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "impossible d'accéder au fichier rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires     - afficher le champ « requires » : toutes les dépendances.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - afficher le champ « files » : tous les fichiers.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "impossible d'analyser « %s » dans le fichier [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voulez-vous continuer l'installation ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts    - afficher le champ « conflicts » : tous les conflits.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "impossible de lire le fichier rpm [%s] depuis le média « %s »"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes    - afficher le champ « obsoletes » : toutes les "
+"obsolescences.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
-"                   distribution, utile pour (dés)installer un chroot avec\n"
-"                   l'option --root.\n"
+"  --env          - utiliser un environment spécifique (en général\n"
+"                   un rapport de bogue).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "fichier de synthèse créé pour le média « %s »"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignorer la distinction de case.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - affiche des informations utiles dans une forme "
-"compréhensible.\n"
+"  -f             - affiche la version, la release et l'architecture\n"
+"                   du paquetage avec le nom\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - spécifier une version de distribution. Celle par défaut "
-"est\n"
-"                   donnée par le paquetage « mandrake-release ».\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclure du code perl directement.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --env          - utiliser l'url spécifiée pour une liste de miroirs, par "
-"défaut\n"
-"                   %s\n"
+"  -a             - opérateur binaire ET, vrai si les deux expressions sont\n"
+"                   vraies.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
-"                   distribution, utile pour (dés)installer un chroot avec\n"
-"                   l'option --root.\n"
+"  -o             - opérateur binaire OU, vrai si une expression est vraie.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NON unaire, vrai si l'expression est fausse.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
-"de bogue, ou de l'effacer."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "démontage de %s"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
+"  (              - parenthèse gauche pour ouvrir un groupe d'expression.\n"
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% complèté, vitesse = %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - parenthèse droite pour fermer un groupe d'expression.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "restarting urpmi"
-msgstr "Redémarrage de urpmi"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"Le callback est :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "examen de la liste de synthèse [%s]"
+msgid "using specific environment on %s\n"
+msgstr "avec environnement spécifique sur %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
+"Note: comme aucun des media spécifiés n'utilise de hdlist, urpmf n'a pu "
+"retourner de résultat\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "...copying failed"
-msgstr "...copie impossible"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 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"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "impossible d'accéder au fichier hdlist de « %s »; média ignoré"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
+"                   de données urpmi.\n"
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode peu verbeux.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - sélection automatique des paquetages à mettre à jour.\n"
 
-#: ../urpmf:1
+#: ../urpmi:85
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode verbeux.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - ne jamais demander de désinstallation, plutôt annuler "
+"l'installation.\n"
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - donner tous les paquetages sources avant de télécharger.\n"
-"                   (root seulement).\n"
+"  --keep         - conserve les paquetages existants si possible, rejette "
+"les paquetages demandés\n"
+"                   qui nécessitent des désinstallations.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - extraire les en-têtes des paquetages listés de la base "
-"urpmi\n"
-"                   vers la sortie standard (root seulement).\n"
+"  --split-level  - découper en petites transactions si plus du nombre "
+"spécifié\n"
+"                   de paquetages doivent être installés ou mis à jour.\n"
+"                   (%d par défaut).\n"
 
-#: ../urpme:1
+#: ../urpmi:91
 #, c-format
-msgid "unknown packages"
-msgstr "paquetages inconnus"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
+"  --split-length - longueur de la petite transaction (%d par défaut).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "sélection de plusieurs médias : %s"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - imposer la recherche floue (identique à -y).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  -f             - affiche la version, la release et l'architecture\n"
-"                   du paquetage avec le nom\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "le fichier [%s] est déjà utilisé sur le même support « %s »"
+"  --src          - le prochain paquetage est un paquetage source\n"
+"                   (identique à -s).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:94
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "rien à retirer (utiliser urpmi.addmedia  pour ajouter un média)\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - n'installer que les paquetages-source (pas les "
+"binaires).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "impossible de trouver le fichier liste de « %s »; média ignoré"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - enlever tous les rpm du cache avant toute opération.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:96
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - afficher ce message d'aide\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - garder les rpm non utilisés dans le cache.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "support distribué trouvé pour les noeuds : %s"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permet à l'utilisateur qui le demande d'installer\n"
+"                   des paquetages sans vérifier les dépendances.\n"
 
-#: ../urpmf:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"Le callback est :\n"
-"%s\n"
+"  --allow-force  - autoriser l'utilisateur qui le demande à installer les\n"
+"                   paquetages sans vérifier ni les dépendances ni "
+"l'intégrité.\n"
 
-#: ../urpmq:1
+#: ../urpmi:104
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"  -R             - recherche inversée des items nécessitant ce paquetage.\n"
+"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
+"                   distribution, utile pour (dés)installer un chroot avec\n"
+"                   l'option --root.\n"
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, 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"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"urpmf 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"
+"  --wget         - utiliser wget pour récupérer les fichiers distants.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  --quiet        - ne pas afficher le nom des champs (actif par défaut,\n"
-"                   incompatible avec le mode interactif).\n"
+"  --curl         - utiliser curl pour récupérer les fichiers distants.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limiter la vitesse de téléchargement.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"--synthesis ne peut pas être utilisé avec --media, --excludemedia, --"
-"sortmedia, --update ou --parallel"
+"  --resume       - reprend le transfert des fichiers partiellement "
+"téléchargés\n"
+"                   (--no-resume le désactive, le choix par défaut est "
+"désactivé).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --arch         - spécifier l'architecture. Celle par défaut est donnée "
-"par\n"
-"                   le paquetage mandrake-release.\n"
-
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Est-ce correct ?"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - exclut les fichiers de documentation.\n"
+"  --proxy        - utiliser le proxy HTTP indiqué, le n° de port \n"
+"                   étant 1080 à défaut d'indication (format <proxy[:port]"
+">).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
-"                   de données urpmi.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examen du support distribué dans le fichier [%s]"
+"  --proxy-user   - spécifier l'utilisateur et le mot de passe pour \n"
+"                   l'authentification proxy (format <utilisateur:"
+"motdepasse>).\n"
 
-#: ../urpme:1
+#: ../urpmi:115
 #, c-format
-msgid "Nothing to remove"
-msgstr "Rien à désinstaller"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug          - délivrer un rapport de bogue dans le répertoire\n"
+"                   indiqué en second argument.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...clé %s importée à partir du fichier de la clé publique de « %s »"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utiliser l'interface graphique (X11)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "lecture des en-têtes du média « %s »"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - choisir la meilleure interface en fonction de\n"
+"                   l'environnement : mode graphique ou textuel.\n"
 
-#: ../urpmq:1
+#: ../urpmi:122
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - étend la requête aux dépendances du paquetage.\n"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - vérifier la signature du rpm avant l'installation.\n"
+"                   (--no-verify-rpm désactive la vérification).\n"
 
-#: ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
-"  --bug          - délivrer un rapport de bogue dans le répertoire\n"
-"                   indiqué en second argument.\n"
+"  --excludepath  - exclure les chemins indiqués, séparés par des virgules.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "Le média « %s » ne définit aucun emplacement pour les fichiers rpm"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - exclut les fichiers de documentation.\n"
 
-#: ../urpmf:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - afficher le champ « sourcerpm » : source rpm.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - sélectionne toutes les correspondances de la ligne de\n"
+"                   commande.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "impossible d'écrire le fichier de liste « %s »"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - cherche dans les apports pour trouver le paquetage.\n"
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --requires     - afficher le champ « requires » : toutes les dépendances.\n"
+"  -P             - ne pas chercher dans les apports pour trouver un "
+"paquetage.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "essai de sélection du média inexistant « %s »"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - imposer la recherche floue (identique à --fuzzy).\n"
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - afficher le champ « description » : description.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - le prochain paquetage est un paquetage source\n"
+"                   (identique  --src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "Copying failed"
-msgstr "Copie impossible"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode peu verbeux.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  les noms ou les fichiers rpm donnés en ligne de commande seront "
+"installés.\n"
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes peut seulement être utilisé avec --parallel"
+msgid "Choose location to save file"
+msgstr "Choisissez un emplacement pour enregistrer le fichier."
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "pas de fichier hdlist trouvé pour le média « %s »"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Ce qui peut être fait avec les fichiers binaires rpm avec l'option --install-"
+"src"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"  -s             - le prochain paquetage est un paquetage source\n"
-"                   (identique  --src).\n"
+"Vous avez choisi un paquetage de sources:\n"
+"\n"
+"%s\n"
+"\n"
+"Vous ne désirez probablement l'installer sur votre ordinateur. "
+"( L'installer\n"
+"vous permettra de modifier le code source, puis de le recompiler. )\n"
+"\n"
+"Que voulez vous faire ?"
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "installing %s"
-msgstr "installation de %s"
+msgid "Do nothing"
+msgstr "Ne rien faire"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lecture des fichiers rpm à partir de [%s]"
+msgid "Yes, really install it"
+msgstr "Oui, l'installer vraiment."
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copie du fichier description de « %s »"
+msgid "Save file"
+msgstr "Enregistrer le fichier"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --auto         - sélectionner automatiquement un paquetage parmi les "
-"choix\n"
+"Vous êtes sur le point d'installer les paquetages suivant sur votre "
+"ordinateur :\n"
+"\n"
+"%s\n"
+"\n"
+"Peut-être préférez-vous simplement les enregistrer. Quel est votre choix ?"
 
-#: ../urpme:1
+#: ../urpmi:230
 #, c-format
-msgid "Removing failed"
-msgstr "Échec de la désinstallation"
+msgid "Install it"
+msgstr "L'installer"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  --virtual      - créer un média virtuel qui est toujours à jour,\n"
-"                   seul le protocole « file:// » est autorisé.\n"
+"Le répertoire [%s] existe déjà, merci d'en utiliser un autre pour le rapport "
+"de bogue, ou de l'effacer."
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "paquetage %s non trouvé"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Impossible de créer le répertoire [%s] pour le rapport de bogue"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "enlever le média « %s »"
+msgid "Copying failed"
+msgstr "Copie impossible"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
+msgid "Only superuser is allowed to install packages"
+msgstr "Seul l'administrateur système (root) peut installer des paquetages"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Annuler"
+msgid "One of the following packages is needed:"
+msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - le prochain paquetage est un paquetage source\n"
-"                   (identique à -s).\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Que choisissez-vous ? (1-%d)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - utiliser un environment spécifique (en général\n"
-"                   un rapport de bogue).\n"
+msgid "Package installation..."
+msgstr "Installation du paquetage..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Initialisation..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --sortmedia    - trier les média selon des sous-chaînes (séparées\n"
-"                   par des virgules).\n"
+"Certains paquetages demandés ne peuvent pas être installés :\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "impossible d'accéder au média « %s »"
+msgid "do you agree ?"
+msgstr "Êtes-vous d'accord ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "impossible de créer le média « %s »\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"La mise à jour ne peut pas continuer car les paquetages suivants\n"
+"doivent être désinstallés :\n"
+"%s\n"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --packager     - afficher le champ « packager » : créateur du paquetage.\n"
+"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
+"désinstallés :\n"
+"%s"
 
-#: ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - renvoie la configuration sous forme d'un argument\n"
-"                   pour urpmi.addmedia.\n"
+"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
+"installés (%d Mo)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1653,403 +1622,439 @@ msgstr ""
 "Vous devez être root pour installer les dépendances suivantes :\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - imprime le changelog.\n"
+msgid "unable to get source packages, aborting"
+msgstr "impossible de récupérer les paquetages sources, abandon"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "impossible d'accéder au fichier de liste de « %s »; média ignoré"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - parenthèse droite pour fermer un groupe d'expression.\n"
+msgid "Press Enter when ready..."
+msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
-"aucun programme de rapatriement de pages web trouvé, ceux supportés sont: %"
-"s\n"
+msgid "Downloading package `%s'..."
+msgstr "téléchargement du paquetage %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "examen du fichier hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% sur %s, temps total = %s, vitesse = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copie du fichier hdlists..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% complèté, vitesse = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Écriture de la liste des fichiers pour le média « %s »"
+msgid "The following packages have bad signatures"
+msgstr "Les paquetages suivants ont des signatures non valides"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "le média virtuel « %s » devrait avoir une url claire, média ignoré"
+msgid "Do you want to continue installation ?"
+msgstr "Voulez-vous continuer l'installation ?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - afficher le champ « buildhost » : build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"L'installation a échoué, il manque des fichiers :\n"
+"%s\n"
+"Vous devriez mettre à jour votre base de données urpmi"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Ne rien faire"
+msgid "Installation failed"
+msgstr "L'installation a échoué"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "utilisation du média associé pour le mode distribué : %s"
+msgid "distributing %s"
+msgstr "distribution de %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "montage de %s"
+msgid "installing %s"
+msgstr "installation de %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"impossible de tenir compte de « %s » car la liste de fichiers est déjà "
-"utilisée par un autre média"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "impossible de récupérer les paquetages sources, abandon"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
-"  --root         - utiliser un autre répertoire racine pour l'installation "
-"du rpm.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% sur %s, temps total = %s, vitesse = %s"
+msgid "%d installation transactions failed"
+msgstr "%d transactions d'installation ont échoué"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr ""
-"calcul de la somme de contrôle MD5sum du fichier hdlist (ou de synthèse) "
-"téléchargé"
+msgid "Installation is possible"
+msgstr "L'installation est possible"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "impossible d'importer le fichier de la clé publique de « %s »"
+msgid "Everything already installed"
+msgstr "Tout est déjà installé"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
-"  --no-uninstall - ne jamais demander de désinstallation, plutôt annuler "
-"l'installation.\n"
+msgid "restarting urpmi"
+msgstr "Redémarrage de urpmi"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"Utilisation : urpmi.addmedia [options] <nom> <url> [with <chemin relatif>]\n"
+"où <url> est l'un de :\n"
+"       file://<chemin> with <nom de fichier relatif de hdlist>\n"
+"       ftp://<utilisateur>:<mot de passe>@<hôte>/<chemin> with <nom de "
+"fichier relatif de hdlist>\n"
+"       ftp://<hôte>/<chemin> with <nom de fichier relatif de hdlist>\n"
+"       http://<host>/<path> with <nom de fichier relatif de hdlist>\n"
+"       removable://<chemin>\n"
 "\n"
-"usage :\n"
+"et [options] sont issues de\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "récupération du hdlist source (ou synthèse) de « %s »..."
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - créer un média de mise à jour.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - afficher les groupes ainsi que les noms\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - essayer de trouver et d'utiliser un fichier de "
+"synthèse.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "le média « %s » n'est pas sélectionné"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
+"  --probe-hdlist - essayer de trouver et d'utiliser un fichier hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Seul l'administrateur système (root) peut installer des paquetages"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ne pas essayer de trouver un fichier hdlist\n"
+"                   ou de synthèse.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "avec environnement spécifique sur %s\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - créer automatiquement tous les médias à partir\n"
+"                   d'un média d'installation.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "impossible de trouver le fichier hdlist pour « %s »; média ignoré"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - créer automatiquement un média pour XXX appartenant à\n"
+"                   une distribution, XXX peut être main (principal),\n"
+"                   contrib (contributions), updates (mises à jour)\n"
+"                   ou n'importe quoi d'autre qui a été configuré ;-)\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  --split-length - longueur de la petite transaction (%d par défaut).\n"
+"  --env          - utiliser l'url spécifiée pour une liste de miroirs, par "
+"défaut\n"
+"                   %s\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  (              - parenthèse gauche pour ouvrir un groupe d'expression.\n"
+"  --version      - spécifier une version de distribution. Celle par défaut "
+"est\n"
+"                   donnée par le paquetage « mandrake-release ».\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop de points de montage pour le média amovible « %s »"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - spécifier l'architecture. Celle par défaut est donnée "
+"par\n"
+"                   le paquetage mandrake-release.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"  -a             - opérateur binaire ET, vrai si les deux expressions sont\n"
-"                   vraies.\n"
+"  --virtual      - créer un média virtuel qui est toujours à jour,\n"
+"                   seul le protocole « file:// » est autorisé.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
-"Impossible d'accéder au média « %s »,\n"
-"cela peut arriver si vous avez effectué un montage manuel lors de la "
-"création du média."
+"  --no-md5sum    - Supprime la vérification de la somme de contrôle "
+"(MD5SUM).\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - afficher le champ « group » : groupe.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - purger le répertoire cache des en-têtes.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forcer la génération des fichiers hdlist.\n"
+
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
-"  --media        - utiliser seulement les média listés (séparés par des\n"
-"                   virgules).\n"
+"Ne peut ajouter des mises à jour sur une distribution "
+"« cooker » (« betas »)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to create transaction"
-msgstr "impossible de créer la transaction"
+msgid "retrieving mirrors at %s ..."
+msgstr "récupération des mirroirs depuis %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "récupération des fichiers rpm à partir de « %s »..."
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "inutile de spécifier  le <chemin relatif de hdlist> avec --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Vous avez choisi un paquetage de sources:\n"
-"\n"
-"%s\n"
-"\n"
-"Vous ne désirez probablement l'installer sur votre ordinateur. "
-"( L'installer\n"
-"vous permettra de modifier le code source, puis de le recompiler. )\n"
-"\n"
-"Que voulez vous faire ?"
+msgid "unable to update medium \"%s\"\n"
+msgstr "impossible de mettre à jour le média « %s »\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "distributing %s"
-msgstr "distribution de %s"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<chemin relatif de hdlist> manquant\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "Installation failed"
-msgstr "L'installation a échoué"
+msgid "`with' missing for network media\n"
+msgstr "directive « with » manquante pour les médias en réseau\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "write config file [%s]"
-msgstr "écriture du fichier de configuration [%s]"
+msgid "unable to create medium \"%s\"\n"
+msgstr "impossible de créer le média « %s »\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - sélectionne tous les médias non amovibles\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Utilisation : urpmi.removemedia [-a] <nom> ...\n"
+"où <nom> est le nom du média à retirer.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - afficher le champ « epoch » : série.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - sélectionne toutes les medias\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --verify-rpm   - vérifier la signature du rpm avant l'installation.\n"
-"                   (--no-verify-rpm désactive la vérification).\n"
+"\n"
+"option inconnue '%s'\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "rien à retirer (utiliser urpmi.addmedia  pour ajouter un média)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - créer un média de mise à jour.\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"L'entrée à retirer est manquante\n"
+" (l'une parmi %s)\n"
 
-#: ../urpmq:1
+#: ../urpmi.update:28
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url   - montrer tous les médias disponibles et leurs URL.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Utillisation : urpmi.update [options] <nom> ...\n"
+"où <nom> est un nom de média à mettre à jour.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - imposer la recherche floue (identique à --fuzzy).\n"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ne rafraîchir que les médias de mise à jour.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - force la mise à jour de la clef gpg.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:41
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "description « %s »  invalide dans le fichier des hdlists"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - sélectionne tous les médias non amovibles\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:63
 #, c-format
-msgid "removing %s"
-msgstr "désinstallation de %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --distrib-XXX  - créer automatiquement un média pour XXX appartenant à\n"
-"                   une distribution, XXX peut être main (principal),\n"
-"                   contrib (contributions), updates (mises à jour)\n"
-"                   ou n'importe quoi d'autre qui a été configuré ;-)\n"
+"l'entrée à mettre à jour est manquante\n"
+"(un parmi de %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 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:1
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - afficher le champ « size » : taille.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - montrer tous les paquetages disponibles.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
-msgstr "afin de garder %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - montrer tous les médias disponibles.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "car %s  est non satisfait"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url   - montrer tous les médias disponibles et leurs URL.\n"
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Installation automatique des paquetages...\n"
-"Vous avez demandé l'installation du paquetage %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "base de données urpmi vérouillée"
+"  --dump-config  - renvoie la configuration sous forme d'un argument\n"
+"                   pour urpmi.addmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"  --resume       - reprend le transfert des fichiers partiellement "
-"téléchargés\n"
-"                   (--no-resume le désactive, le choix par défaut est "
-"désactivé).\n"
+"  --list-nodes   - montrer tous les noeuds disponibles en.\n"
+"                   utilisant --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "examen du fichier de la clé publique de « %s »..."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lister les alias parallèles disponibles.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --no-md5sum    - Supprime la vérification de la somme de contrôle "
-"(MD5SUM).\n"
+"  --headers      - extraire les en-têtes des paquetages listés de la base "
+"urpmi\n"
+"                   vers la sortie standard (root seulement).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "périphérique amovible pris en tant que « %s »"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - donner tous les paquetages sources avant de télécharger.\n"
+"                   (root seulement).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Vous êtes sur le point d'installer les paquetages suivant sur votre "
-"ordinateur :\n"
-"\n"
-"%s\n"
-"\n"
-"Peut-être préférez-vous simplement les enregistrer. Quel est votre choix ?"
+"  --use-distrib  - configure urpmi à la volée d'après l'arbre d'une\n"
+"                   distribution, permettant d'interroger une distribution.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - imposer la recherche floue (identique à -y).\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - imprime le changelog.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - étend la requête aux dépendances du paquetage.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2058,47 +2063,85 @@ msgstr ""
 "  -u             - enlève le paquetage si une version plus récente est déjà\n"
 "                   installée.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"  --probe-hdlist - essayer de trouver et d'utiliser un fichier hdlist.\n"
+"  -c             - sortie sur la ligne de commande avec les\n"
+"                   noms des paquetages à désinstaller.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "en raison du manque de %s"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr ""
+"  -R             - recherche inversée des items nécessitant ce paquetage.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - n'utiliser que les média de mise à jour.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - affiche des informations utiles dans une forme "
+"compréhensible.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - afficher les groupes ainsi que les noms\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - affiche la version détaillée ainsi que le nom.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - liste les fichiers d'un paquetage.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"Utillisation : urpmi.update [options] <nom> ...\n"
-"où <nom> est un nom de média à mettre à jour.\n"
+"  les noms ou fichiers rpm indiqués sur la ligne de commandes sont "
+"intérrogés.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "tentative d'ignorer le média existant « %s »; abandon"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes peut seulement être utilisé avec --parallel"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test         - vérifier si l'installation fonctionne correctement.\n"
 
-#: ../urpmf:1
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "aucune liste de sources complète n'a pu être trouvée"
+
+#: ../urpmq:398
 #, c-format
-msgid "Note: since no media searched uses hdlists, urpmf was unable to return any result\n"
-msgstr "Note: comme aucun des media spécifiés n'utilise de hdlist, urpmf n'a pu retourner de résultat\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "L'un des paquetages suivants est nécessaire pour installer %s :"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Programme inconnu de rapatriement de pages web « %s » !!!\n"
@@ -2277,9 +2320,6 @@ msgstr "Note: comme aucun des media spécifiés n'utilise de hdlist, urpmf n'a p
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "essayez « urpmf --help » pour plus d'options"
 
-#~ msgid "no full media list was found"
-#~ msgstr "aucune liste de sources complète n'a pu être trouvée"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "copie de la liste source de « %s »..."
 
diff --git a/po/fur.po b/po/fur.po
new file mode 100644
index 00000000..b5c227c2
--- /dev/null
+++ b/po/fur.po
@@ -0,0 +1,2065 @@
+# translation of urpmi-fur.po to furlan
+# translation of urpmi.po to furlan
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Andrea Gracco <graccoandrea@tin.it>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: urpmi-fur\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
+"PO-Revision-Date: 2004-05-17 23:57+0200\n"
+"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
+"Language-Team: furlan <gft@freelists.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
+#. you can put here the letters for 'yes' for your language, so people
+#. can hit those keys in their keyboard to reply.
+#. please keep the 'Yy' for compatibility reasons
+#.
+#: placeholder.h:11
+msgid "Yy"
+msgstr "SsYy"
+
+#. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
+#. you can put here the letters for 'no' for your language, so people
+#. can hit those keys in their keyboard to reply.
+#. please keep the 'Nn' for compatibility reasons
+#.
+#: placeholder.h:17
+msgid "Nn"
+msgstr "Nn"
+
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalant %s\n"
+
+#: ../_irpm:33
+#, c-format
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Instalazion automatiche dai pachets...\n"
+"Tu âs domandât le instalazion dal pachet %s\n"
+
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, c-format
+msgid "Is this OK?"
+msgstr "Isal just?"
+
+#: ../_irpm:35 ../urpm/msg.pm:40
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
+#: ../_irpm:36 ../urpm/msg.pm:41
+#, c-format
+msgid "Cancel"
+msgstr "Scancele"
+
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (s/N) "
+
+#: ../_irpm:63
+#, c-format
+msgid "%s: command not found\n"
+msgstr "%s: comant no cjatât\n"
+
+#: ../rpm-find-leaves:11
+#, c-format
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"ûs: %s [opzions]\n"
+"la che [opzions] e son di\n"
+
+#: ../rpm-find-leaves:13
+#, c-format
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - stampe chest mes di jutori.\n"
+
+#: ../rpm-find-leaves:14
+#, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - selezione i risultâts di chel grop.\n"
+
+#: ../rpm-find-leaves:15
+#, c-format
+msgid "                    defaults is %s.\n"
+msgstr "                    il valôr predefinît al è %s.\n"
+
+#: ../urpm.pm:57
+#, c-format
+msgid "unknown protocol defined for %s"
+msgstr "protocol no cognosût definît par %s"
+
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nissun webfetch cjatât, chei sopuartâts e son: %s\n"
+
+#: ../urpm.pm:95
+#, c-format
+msgid "unable to handle protocol: %s"
+msgstr "no rivi a gjestî il protocol: %s"
+
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "fal di sintassi tal file config, rie %s"
+
+#: ../urpm.pm:174
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "le font \"%s\" e cîr di doprâ une hdlist dizà in vore, font ignorade"
+
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "le font \"%s\" e cîr di doprâ une liste dizà doprade, le ignori"
+
+#: ../urpm.pm:196
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"no rivi a ocupâmi de font \"%s\", il file list al è dizà doprât di un altre "
+"font"
+
+#: ../urpm.pm:202
+#, c-format
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"no rivi a doprâ il non \"%s\" pe font cence non parce che al è dizà in vore"
+
+#: ../urpm.pm:209
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"no rivi a cjapâ in considerazion le font \"%s\" parce che no esist une liste "
+"di file [%s]"
+
+#: ../urpm.pm:213
+#, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "no rivi a stabilî le font di chest file hdlist [%s]"
+
+#: ../urpm.pm:222
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "no rivi a acedi al file hdlist di \"%s\", font ignorade"
+
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "no rivi a acedi al file de liste di \"%s\", font ignorade"
+
+#: ../urpm.pm:249
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "o cîr di lassâ fûr le font esistint \"%s\", o eviti"
+
+#: ../urpm.pm:257
+#, c-format
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"le font virtuâl \"%s\" no a di ve un file hdlist o list, le font e vignarâ "
+"ignorâde"
+
+#: ../urpm.pm:262
+#, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "le font virtuâl \"%s\" e a di vê un url clâr, font ignorade"
+
+#: ../urpm.pm:271
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "no rivi a cjatâ il file hdlist par \"%s\", font ignorade"
+
+#: ../urpm.pm:278
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "no rivi a cjatâ il file de liste par \"%s\", font ignorade"
+
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "liste dai file incoerent par \"%s\" font ignorade"
+
+#: ../urpm.pm:309
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "no rivi a analizâ le liste dai file par \"%s\", font ignorade"
+
+#: ../urpm.pm:342
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "e son masse ponts di mount pe font rimovibil \"%s\""
+
+#: ../urpm.pm:343
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "o consideri le font rimovibil sicu \"%s\""
+
+#: ../urpm.pm:347
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "o stoi doprant un diferent dispositîf rimovibil [%s] par \"%s\""
+
+#: ../urpm.pm:352 ../urpm.pm:355
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "no rivi a recuperâ il percôrs pe font rimovibil \"%s\""
+
+#: ../urpm.pm:368
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "no rivi a scrivi tal file di configurazion [%s]"
+
+#: ../urpm.pm:390
+#, c-format
+msgid "write config file [%s]"
+msgstr "scrîf il file di configurazion [%s]"
+
+#: ../urpm.pm:402
+#, c-format
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "No rivi a doprâ le maniere paralêle insieme cun che user-distrib"
+
+#: ../urpm.pm:412
+#, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "no rivi a analizâ \"%s\" tal file [%s]"
+
+#: ../urpm.pm:423
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "o stoi esaminant il gjestôr paralêl tal file [%s]"
+
+#: ../urpm.pm:433
+#, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "cjatât gjestôr paralêl par i grops: %s"
+
+#: ../urpm.pm:437
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "o dopri les fonts pariadis pe maniere paralêle: %s"
+
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "no rivi a doprâ le opzion paralêle \"%s\""
+
+#: ../urpm.pm:452
+#, c-format
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
+"  synthesis a nol po sedi doprât cun --media, --excludemedia, --sortmedia, --"
+"update o --parallel"
+
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "o esamini il file synthesis [%s]"
+
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "o esamini il file hdlist [%s]"
+
+#: ../urpm.pm:517 ../urpm.pm:902
+#, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "le font virtuâl \"%s\" no je locâl, font ignorade"
+
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
+#, c-format
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "probleme leint il file hdlist/synthesis del font \"%s\""
+
+#: ../urpm.pm:551 ../urpm.pm:1665
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr "o passi a le seconde fase par valutâ les dipindincis\n"
+
+#: ../urpm.pm:563
+#, c-format
+msgid "skipping package %s"
+msgstr "o salti il pachet %s"
+
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "e instalares il pachet invezit di atualizalu %s"
+
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
+#, c-format
+msgid "unable to open rpmdb"
+msgstr "no rivi a vierzi il database rpm"
+
+#: ../urpm.pm:622
+#, c-format
+msgid "medium \"%s\" already exists"
+msgstr "le font \"%s\" e esist dizà"
+
+#: ../urpm.pm:629
+#, c-format
+msgid "virtual medium need to be local"
+msgstr "le font virtuâl e a di sedi locâl"
+
+#: ../urpm.pm:661
+#, c-format
+msgid "added medium %s"
+msgstr "font zontade %s"
+
+#: ../urpm.pm:677
+#, c-format
+msgid "unable to access first installation medium"
+msgstr "no rivi a acedi a le prime font di instalazion"
+
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "o copii il file hdlist..."
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, c-format
+msgid "...copying failed"
+msgstr "...copie falade"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...copie finide"
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"no rivi a acedi a le prime font di instalazion (no ai cjatât nissun file "
+"Mandrake/base/hdlists)"
+
+#: ../urpm.pm:691
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "o recuperi il file hdlist..."
+
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
+#, c-format
+msgid "...retrieving done"
+msgstr "...copie finide"
+
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...copie falade: %s"
+
+#: ../urpm.pm:720
+#, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descrizion hdlist no valevule \"%s\" tal file di hdlist"
+
+#: ../urpm.pm:765
+#, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "o cîr di selezionâ une font che no esist \"%s\""
+
+#: ../urpm.pm:767
+#, c-format
+msgid "selecting multiple media: %s"
+msgstr "o stoi selezionant plui fonts: %s"
+
+#: ../urpm.pm:767
+#, c-format
+msgid "\"%s\""
+msgstr "\"%s\""
+
+#: ../urpm.pm:783
+#, c-format
+msgid "removing medium \"%s\""
+msgstr "o rimôf le font \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"no rivi a acedi ale font \"%s\",\n"
+"chest al po intravignî se tu âs montât manualmentri le cartele dilunc de "
+"creazion de font."
+
+#: ../urpm.pm:996
+#, c-format
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"le font virtuâl \"%s\" e vares di ve un percors valevul par hdlist o "
+"synthesis, font ignorade"
+
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "o copii il file di descrizion di \"%s\"..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "o calcoli md5sum dai file hdlist (o synthesis) esistints"
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "O esamini il file MD5SUM"
+
+#: ../urpm.pm:1092
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copii il file hdlist (o sinthesis) di \"%s\"..."
+
+#: ../urpm.pm:1105
+#, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "copie di [%s] falade (il file al è piçul in maniere suspiete)"
+
+#: ../urpm.pm:1109
+#, c-format
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "control md5sum dal file hdlist (o synthesis) copiât"
+
+#: ../urpm.pm:1111
+#, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "copie di [%s] falade (md5sum no valevul)"
+
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
+#, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "probleme leint il file synthesis o le font \"%s\""
+
+#: ../urpm.pm:1174
+#, c-format
+msgid "reading rpm files from [%s]"
+msgstr "o stoi leint i file rpm di [%s]"
+
+#: ../urpm.pm:1199
+#, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "no rivi a lei i file rpm di [%s]: %s"
+
+#: ../urpm.pm:1204
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "nissun file rpm cjatât di [%s]"
+
+#: ../urpm.pm:1333
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
+
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
+
+#: ../urpm.pm:1398
+#, c-format
+msgid "md5sum mismatch"
+msgstr "md5sum no corispondent"
+
+#: ../urpm.pm:1483
+#, c-format
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "recuperâmint dal file hdlist (o synthesis) falât"
+
+#: ../urpm.pm:1490
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nissun file hdlist cjatât pe font \"%s\""
+
+#: ../urpm.pm:1501 ../urpm.pm:1555
+#, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] dizà in vore te stesse font \"%s\""
+
+#: ../urpm.pm:1541
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "no rivi a analizâ il file hdllist di \"%s\""
+
+#: ../urpm.pm:1579
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "no rivi a scrivi il file liste di \"%s\""
+
+#: ../urpm.pm:1586
+#, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "o scrîf le liste pe font \"%s\""
+
+#: ../urpm.pm:1588
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "no l'è stât scrit nuie tal file list par \"%s\""
+
+#: ../urpm.pm:1603
+#, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "o controli il file pubkey di \"%s\"..."
+
+#: ../urpm.pm:1610
+#, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...impuartade le clâf %s dal file pubkey di \"%s\""
+
+#: ../urpm.pm:1613
+#, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "no rivi a impuartâ il file pubkey di \"%s\""
+
+#: ../urpm.pm:1679
+#, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "o stoi leint les intestaduris de font \"%s\""
+
+#: ../urpm.pm:1684
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "creant hdlist [%s]"
+
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "o ai creât il file synthesis pe font \"%s\""
+
+#: ../urpm.pm:1745
+#, c-format
+msgid "found %d headers in cache"
+msgstr "%d intestaduris cjatadis in cache"
+
+#: ../urpm.pm:1749
+#, c-format
+msgid "removing %d obsolete headers in cache"
+msgstr "o stoi rimovint %d vielis intestaduris in cache"
+
+#: ../urpm.pm:1893
+#, c-format
+msgid "mounting %s"
+msgstr "o stoi montant %s"
+
+#: ../urpm.pm:1906
+#, c-format
+msgid "unmounting %s"
+msgstr "o stoi dismontant %s"
+
+#: ../urpm.pm:1928
+#, c-format
+msgid "relocated %s entries in depslist"
+msgstr "%s entry riposizionadis te deplist"
+
+#: ../urpm.pm:1929
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "nissune vôs tornade a meti te deplist"
+
+#: ../urpm.pm:1942
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "non dal file rpm no valevul [%s]"
+
+#: ../urpm.pm:1948
+#, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "o recuperi il file rpm [%s] ..."
+
+#: ../urpm.pm:1955 ../urpm.pm:2821
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "no rivi a acedi al file rpm [%s]"
+
+#: ../urpm.pm:1960
+#, c-format
+msgid "unable to register rpm file"
+msgstr "no rivi a regjstrâ il file rpm"
+
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "fal te regjistrazion dai pachets locâi"
+
+#: ../urpm.pm:2076
+#, c-format
+msgid "no package named %s"
+msgstr "nissun pachet clamât %s"
+
+#: ../urpm.pm:2079 ../urpme:88
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "I pachets seguints e contegnin %s: %s"
+
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "a son plui pachets rpm cun il stes non di file \"%s\""
+
+#: ../urpm.pm:2335
+#, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "no rivi a analizâ coretementri [%s] par il valôr \"%s\""
+
+#: ../urpm.pm:2362
+#, c-format
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"le font \"%s\" e dopre une liste di file no valevule:\n"
+"probabilmentri il mirror no l'è atualizât, prove a doprâ altris manieris"
+
+#: ../urpm.pm:2366
+#, c-format
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "le font \"%s\" no definis nissune posizion par file rpm"
+
+#: ../urpm.pm:2378
+#, c-format
+msgid "package %s is not found."
+msgstr "il pachet %s no l'è stât cjatât."
+
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, c-format
+msgid "urpmi database locked"
+msgstr "database urpmi blocât"
+
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "le font \"%s\" no je selezionade"
+
+#: ../urpm.pm:2553
+#, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "no rivi a lei il file rpm [%s] de font \"%s\""
+
+#: ../urpm.pm:2561
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "font \"%s\" no coerente segnade come rimovibil ma no tâl"
+
+#: ../urpm.pm:2574
+#, c-format
+msgid "unable to access medium \"%s\""
+msgstr "no rivi a acedi a le font \"%s\""
+
+#: ../urpm.pm:2635
+#, c-format
+msgid "malformed input: [%s]"
+msgstr "input malformât: [%s]"
+
+#: ../urpm.pm:2642
+#, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "o recuperi il file rpm de font \"%s\"..."
+
+#: ../urpm.pm:2719 ../urpmi:686
+#, c-format
+msgid "Preparing..."
+msgstr "In preparazion..."
+
+#: ../urpm.pm:2752
+#, c-format
+msgid "using process %d for executing transaction"
+msgstr "o dopri il proces %d par eseguî le stramude"
+
+#: ../urpm.pm:2783
+#, c-format
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"e je stade creade le transazion par instalâ su %s (rimôf=%d, instale=%d, "
+"atualize=%d)"
+
+#: ../urpm.pm:2786
+#, c-format
+msgid "unable to create transaction"
+msgstr "no rivi a creâ le transazion"
+
+#: ../urpm.pm:2794
+#, c-format
+msgid "removing package %s"
+msgstr "rimozion dal pachet %s"
+
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
+msgstr "no rivi a rimovi il pachet %s"
+
+#: ../urpm.pm:2806
+#, c-format
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "zonte dal pachet %s (id=%d, eid=%d, atualizazion=%d, file=%s)"
+
+#: ../urpm.pm:2809
+#, c-format
+msgid "unable to install package %s"
+msgstr "no rivi a instalâ il pachet %s"
+
+#: ../urpm.pm:3009 ../urpm.pm:3042
+#, c-format
+msgid "due to missing %s"
+msgstr "cause cal mancje %s"
+
+#: ../urpm.pm:3010 ../urpm.pm:3040
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "cause che %s no l'è sodisfat"
+
+#: ../urpm.pm:3011
+#, c-format
+msgid "trying to promote %s"
+msgstr "ricercje dal miôr pachet %s"
+
+#: ../urpm.pm:3012
+#, c-format
+msgid "in order to keep %s"
+msgstr "par tignî %s"
+
+#: ../urpm.pm:3035
+#, c-format
+msgid "in order to install %s"
+msgstr "par instalâ %s"
+
+#: ../urpm.pm:3047
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "cause di conflits cun %s"
+
+#: ../urpm.pm:3049
+#, c-format
+msgid "unrequested"
+msgstr "no domandât"
+
+#: ../urpm.pm:3065
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Firme no valevule (%s)"
+
+#: ../urpm.pm:3092
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Clâf ID (%s) no valevule"
+
+#: ../urpm.pm:3094
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Firme mancjant (%s)"
+
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "declarazion di proxy falade doprant le rie di comant\n"
+
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sielte falade, torne a provâ\n"
+
+#: ../urpme:36
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003,2004 MandrakeSoft.\n"
+"Chest al è software libar e al po sedi ridistribuît sot i termins deGNU "
+"GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - stampe chist mes di jutori.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selezione automatichementri un pachet de sieltis.\n"
+
+#: ../urpme:43 ../urpmi:124
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
+
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - sfuarçe le esecuzion ancje se cualchi pachet no l'esist.\n"
+
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuît tra diferentis machinis.\n"
+
+#: ../urpme:46 ../urpmi:103
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
+
+#: ../urpme:47
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
+"                   par (dis)instalâ un pachet chroot cun opzion --root.\n"
+
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
+#, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - maniere fetôse.\n"
+
+#: ../urpme:50
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - sielç ducj i pachets che cuadrin te espression.\n"
+
+#: ../urpme:83
+#, c-format
+msgid "unknown packages"
+msgstr "pachets no cognossûts"
+
+#: ../urpme:83
+#, c-format
+msgid "unknown package"
+msgstr "pachet no cognossût"
+
+#: ../urpme:93
+#, c-format
+msgid "removing package %s will break your system"
+msgstr "rimovi il pachet %s al prejudicarâ il to sisteme"
+
+#: ../urpme:95
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nuie di rimovi"
+
+#: ../urpme:99
+#, c-format
+msgid "Checking to remove the following packages"
+msgstr "O controli le rimozion dai pachets seguints"
+
+#: ../urpme:106
+#, c-format
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:111 ../urpmi:675
+#, c-format
+msgid "removing %s"
+msgstr "rimozion di %s"
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "Rimozion falade"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Chest software al è software libar e al po sedi redistribuît sot i termins "
+"de GNU GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - dopre dome fonts di atualizazion.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - dopre dome les fonts te liste, disseparadis di virgulis.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - no sta a doprâ les fonts listadis, disseparadis di "
+"virgulis.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - ordene fonts in base a les sotriis disseparadis di "
+"virgulis.\n"
+
+#: ../urpmf:37 ../urpmq:48
+#, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - dopre le synthesis specificade invezit dal db urpmi.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalitât fetôse.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - no sta a stampâ il tag name (predefinît se nol ven doprât "
+"il tag te rie di comant, \n"
+"                   incompatibil cule maniere interative).\n"
+
+#: ../urpmf:41
+#, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - no sta a stampâ riis compagnis.\n"
+
+#: ../urpmf:42
+#, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - stampe ducj i tag.\n"
+
+#: ../urpmf:43
+#, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - stampe il tag group: grop.\n"
+
+#: ../urpmf:44
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - stampe le tag size: dimension.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - stampe tag epoch: ete.\n"
+
+#: ../urpmf:46
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - stampe il tag sourcerpm: pachets rpm sorzint.\n"
+
+#: ../urpmf:49
+#, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - stampe il tag buildhost: host di compilazion dal pachet.\n"
+
+#: ../urpmf:51
+#, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - stampe il tag url: url.\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - stampe il tag provides: elements furnîts dal pachet.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires     - stampe il tag requires: dutis les pretesis dal pachet.\n"
+
+#: ../urpmf:54
+#, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - stampe i file tag: ducj i file.\n"
+
+#: ../urpmf:55
+#, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts     - stampe il tag conflicts: ducj i conflits rilevâts par il "
+"pachet.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
+"pachet.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
+#, c-format
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr ""
+"  --env          - dopre un ambient specific (di solit un\n"
+"                   rapuart di bug).\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignore le distinzion tra maiusculis e minusculis in "
+"cualsisei pattern.\n"
+
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - stampe version, release e architeture cun non.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+"  -e             - cjape dentri il codis perl diretementri sicu perl -e.\n"
+
+#: ../urpmf:62
+#, c-format
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr ""
+"  -a             - AND binari, vêr se dutis dôs les espressions e son "
+"vêris.\n"
+
+#: ../urpmf:63
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - operadôr binari OR, vêr se une des espressions e je "
+"vêre.\n"
+
+#: ../urpmf:64
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NOT unari, vêr se le espression e je false.\n"
+
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - parentesi di çampe par vierzi un grop di espressions.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - parentesis di diestre par sierâ un grop di espressions.\n"
+
+#: ../urpmf:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"il callback al è :\n"
+"%s\n"
+
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "o dopri les variabilis di ambient su %s\n"
+
+#: ../urpmf:150
+#, c-format
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
+
+#: ../urpmi:72
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
+"Chest al è software libar e al po sedi ridistribuît sot dai termins de GNU "
+"GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpmi:82
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
+
+#: ../urpmi:84 ../urpmq:49
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selezione automatichementri i pachets par atualizâ il "
+"sisteme.\n"
+
+#: ../urpmi:85
+#, c-format
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - no sta mai a domandâ di rimovi un pachet, ferme le "
+"instalazion.\n"
+
+#: ../urpmi:86 ../urpmq:51
+#, c-format
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - dopre i pachets esistints se possibil, dinee\n"
+"                   i pacchets domandâts se son di rimovi.\n"
+
+#: ../urpmi:88
+#, c-format
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - dissepare le operazion in piçulis transazions se\n"
+"                   un pachet al stâ par sedi instalât o\n"
+"                   atualizât, il valôr predefinît al è %d.\n"
+
+#: ../urpmi:91
+#, c-format
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
+"  --split-length - par vê transazions plui piçulis, il valôr predefinît al è "
+"%d.\n"
+
+#: ../urpmi:92 ../urpmq:50
+#, c-format
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impon une ricercje fuzzy (sicu -y).\n"
+
+#: ../urpmi:93 ../urpmq:59
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - il prossim pachet al è un pachet sorzint (sicu -s).\n"
+
+#: ../urpmi:94
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instale dome il pachet sorzint (no i binaris).\n"
+
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - al rimôf i rpm de cache prin di fâ cualsisei altre robe.\n"
+
+#: ../urpmi:96
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ten i rpm no doprâs te cache.\n"
+
+#: ../urpmi:98
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permet di domandâ al utent se al ûl instalâ\n"
+"                   dai pachets cence controlâ les dipendencis.\n"
+
+#: ../urpmi:100
+#, c-format
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force   - permet di domandâ al utent di instalâ i pachets cence\n"
+"                   controlâ dipendencis e integritât.\n"
+
+#: ../urpmi:104
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
+"                   par instalâ un pachet chroot cun opzion --root.\n"
+
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - dopre wget par recuperâ file rimîs.\n"
+
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - dopre curl par recuperâ i file rimîs.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limite le velocitât di scjariament.\n"
+
+#: ../urpmi:109
+#, c-format
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr ""
+"  --resume       - ripie le stramude dai faile parzialmentri scjariâts\n"
+"                   (--no-resume lu disabilite, disabilitât predefinît).\n"
+
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#, c-format
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - dopre il proxy HTTP specificât, il numar di puarte\n"
+"                    predefinît al è1080 (formât: <proxyhost[:port]>).\n"
+
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - specifiche utent e password di doprâ par\n"
+"                   le autenticazion cul proxy (formât: <utent:password>).\n"
+
+#: ../urpmi:115
+#, c-format
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug        - stampe un rapuart di bug te cartele specificade dal\n"
+"                   argoment seguitîf.\n"
+
+#: ../urpmi:119
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - dopre le interface X.\n"
+
+#: ../urpmi:120
+#, c-format
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - al scelç le miôr inteface daûr dal ambient:\n"
+"                   X o maniere testuâl.\n"
+
+#: ../urpmi:122
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - verifiche le firme RPM prin de instalazion\n"
+"                   (--no-verify le disabilite, predefinide abilitade).\n"
+
+#: ../urpmi:125
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - trate di gjavâ fûr, disseparâs di virgulis.\n"
+
+#: ../urpmi:126
+#, c-format
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - esclût i file di documentazion.\n"
+
+#: ../urpmi:127 ../urpmq:79
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - selezione dutis les corispondencis te rie di comant.\n"
+
+#: ../urpmi:128
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - consint le ricercje tra i provides dal pachet.\n"
+
+#: ../urpmi:129 ../urpmq:81
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - no sta a cirî tai provides par cjatâ il pachet.\n"
+
+#: ../urpmi:130 ../urpmq:83
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impon une ricercje fuzzy (sicu --fuzzy).\n"
+
+#: ../urpmi:131 ../urpmq:84
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - il prossim pachet al è un pachet sorzint (compagn di --"
+"src).\n"
+
+#: ../urpmi:132
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - maniere cidine.\n"
+
+#: ../urpmi:134
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  i nons o file rpm scrits te linie di comant e vignaran instalâts\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr "Sielç un puest dulà salvâ il file"
+
+#: ../urpmi:197
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Ce puedial sedi fat cun i file binaris rpm cuant che al ven doprât --install-"
+"src"
+
+#: ../urpmi:204
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Tu âs selezionât un pachet sorzint:\n"
+"\n"
+"%s\n"
+"\n"
+"Probabilmentri no tu vuelis instalâlu tal to computer (instalâlu vi "
+"permetares di fâ modifichis al codis sorzint e compilâlu).\n"
+"\n"
+"Ce vuelistu fa?"
+
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr "No sta a fâ nuie"
+
+#: ../urpmi:213
+#, c-format
+msgid "Yes, really install it"
+msgstr "Si, instalilu pardavêr"
+
+#: ../urpmi:214 ../urpmi:231
+#, c-format
+msgid "Save file"
+msgstr "Salve il file"
+
+#: ../urpmi:225
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Tu âs sielzût di instalâ chest pachet tal to computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Tu podaressis preferî di salvâlu. Cuale ise le to sielte?"
+
+#: ../urpmi:230
+#, c-format
+msgid "Install it"
+msgstr "Instale"
+
+#: ../urpmi:239
+#, c-format
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Le cartele [%s] e esist dizà, par plasè dopre une altre cartele par il bug "
+"report o scancelile"
+
+#: ../urpmi:240
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "no rivi a creâ le cartele [%s] par il bug report"
+
+#: ../urpmi:243 ../urpmi:365
+#, c-format
+msgid "Copying failed"
+msgstr "Copie falade"
+
+#: ../urpmi:260
+#, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Dome il superutent al po instalâ pachets"
+
+#: ../urpmi:396
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Al covente un di chiscj pachets:"
+
+#: ../urpmi:403
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Cuale ise le to sielte? (1-%d) "
+
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Package installation..."
+msgstr "Instalazion dal pachet..."
+
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Inizializazion..."
+
+#: ../urpmi:435
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
+"%s"
+
+#: ../urpmi:440 ../urpmi:466
+#, c-format
+msgid "do you agree ?"
+msgstr "confirmistu?"
+
+#: ../urpmi:455
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Le instalazion no po continuâ parce che i pachets seguints\n"
+"e an di sedi rimovûts par atualizâ altris:\n"
+"%s\n"
+
+#: ../urpmi:461
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
+
+#: ../urpmi:505
+#, c-format
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
+"%s\n"
+
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
+
+#: ../urpmi:540
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
+
+#: ../urpmi:541
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "Frache Enter cuant che tu sês pront..."
+
+#: ../urpmi:585
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "O stoi scjariant il pachet '%s'..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s completâts, ETA = %s, velocitât = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completâts velocitât = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Chiscj pachets e an firmis no valevulis"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Âstu voie di continuâ le instalazion?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalazion falade, cualchi file al mancje:\n"
+"%s\n"
+"Tu podaressis ve voe di atualizâ il to database urpmi"
+
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazion falade"
+
+#: ../urpmi:665
+#, c-format
+msgid "distributing %s"
+msgstr "distribuzion di %s"
+
+#: ../urpmi:673
+#, c-format
+msgid "installing %s"
+msgstr "instalazion di %s"
+
+#: ../urpmi:688
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalazion dal pachet `%s' (%s/%s)..."
+
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
+
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr ""
+"Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
+"N) "
+
+#: ../urpmi:772
+#, c-format
+msgid "%d installation transactions failed"
+msgstr "%d stramudis de instalazion faladis"
+
+#: ../urpmi:780
+#, c-format
+msgid "Installation is possible"
+msgstr "Le instalazion e je pussibil"
+
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "rinviament di urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"ûs: urpmi.addmedia [opzions] <non><url> [cun <percors_relatîf>]\n"
+"la che <url> al è un tra\n"
+"        file://<percors>\n"
+"        ftp://<login>:<password>@<host>/<percors> cun <non relatîf di "
+"hdlist>\n"
+"        http://<host>/<percors> cun <non relatîf di hdlist>\n"
+"        removable://<percors>\n"
+"\n"
+"e [opzions ] e son di\n"
+
+#: ../urpmi.addmedia:55
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cree une font di atualizazion.\n"
+
+#: ../urpmi.addmedia:56
+#, c-format
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - cîr e dopre il file synthesis.\n"
+
+#: ../urpmi.addmedia:57
+#, c-format
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
+
+#: ../urpmi.addmedia:58
+#, c-format
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - nol cîr nissun file synthesis o\n"
+"                   hdlist.\n"
+
+#: ../urpmi.addmedia:60
+#, c-format
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crê automaticamentri duç i sopuarts di chei di\n"
+"                   instalazion.\n"
+
+#: ../urpmi.addmedia:62
+#, c-format
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - cree automatichementri une font par una part XXX di\n"
+"                   une distribuzion, XXX e po sedi main, contrib, updates o\n"
+"                   cualsisei altre robe configurade ;-)\n"
+
+#: ../urpmi.addmedia:65
+#, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from        -dopre le url specificade par otignî le liste dai mirror, \n"
+"                   %s\n"
+
+#: ../urpmi.addmedia:67
+#, c-format
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - dopre une specifiche version, che predefinide e je\n"
+"                   otignude de version de sistribuzion mostrade dai\n"
+"                   pachets Mandrake Linux dizà instalâts.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch        - dopre une architeture specificade, che predefinide e je\n"
+"                   che de version di Mandrake Linux.\n"
+
+#: ../urpmi.addmedia:72
+#, c-format
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - cree une font virtuâl che je simpri atualizade,\n"
+"                   al è permitût dome il protocol file://.\n"
+
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilite il control MD5SUM.\n"
+
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - nete les intestaduris de cartele in cache.\n"
+
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - sfuarçe gjenerazion di file hdlist.\n"
+
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "no rivi a zontâ les atualizazions de distribuzion cooker\n"
+
+#: ../urpmi.addmedia:135
+#, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "o recuperi i mirror su %s ..."
+
+#: ../urpmi.addmedia:172
+#, c-format
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no l'è di bisugne di furnî <percors relatîf di hdlist> cun --distrib"
+
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "no rivi a atualizâ le font \"%s\"\n"
+
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
+msgstr "<percors relatîf di hdlist> mancjant\n"
+
+#: ../urpmi.addmedia:192
+#, c-format
+msgid "`with' missing for network media\n"
+msgstr "`with' al mancje par le font in rêt\n"
+
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "no rivi a creâ le font \"%s\"\n"
+
+#: ../urpmi.removemedia:34
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"ûs: urpmi.removemedia [-a] <non> ...\n"
+"la che <non> al è il non de font di rimovi.\n"
+
+#: ../urpmi.removemedia:37
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selezione dutis les fonts.\n"
+
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opzions no cogniossudis '%s'\n"
+
+#: ../urpmi.removemedia:48
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nuie di rimovi (dopre urpmi.addmedia par zontâ une gnove font)\n"
+
+#: ../urpmi.removemedia:50
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"le vôs di rimovi e mancje\n"
+"(une di %s)\n"
+
+#: ../urpmi.update:28
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"ûs: urpmi.update [opzions] <non> ...\n"
+"la che <non> al è il non de font di atualizâ.\n"
+
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "--update       - dopre dome fonts di atualizazion.\n"
+
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - sfuarçe le atualizazion de clâf gpg.\n"
+
+#: ../urpmi.update:41
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - selezione une font no rimovibil.\n"
+
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
+
+#: ../urpmi.update:75
+#, c-format
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"le vôs di atualizâ e mancje\n"
+"(une di %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Chest software al è software libar e al po sedi redistribuît sot i termins "
+"de GNU GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpmq:53
+#, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - liste i pachets disponibii.\n"
+
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - liste les fonts disponibilis.\n"
+
+#: ../urpmq:55
+#, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url     - liste les fonts disponibilis e i lôr url.\n"
+
+#: ../urpmq:56
+#, c-format
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - mostre le configuraizon te maniere doprade di urpmi."
+"addmedia.\n"
+
+#: ../urpmq:57
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - liste i grops disponibii cuant che si dopre --parallel.\n"
+
+#: ../urpmq:58
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - liste i alias paralei disponibii.\n"
+
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - tire fûr les intestaduris dal pachet selezionât dal\n"
+"                   database di urpmi al stdout (dome root).\n"
+
+#: ../urpmq:62
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - liste ducj i pachets sorzint prin di scjariâ (dome "
+"root).\n"
+
+#: ../urpmq:65
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi dal lamp di un arbul distribuît.\n"
+"                   Chest a ti permet di interogâ une distribuzion.\n"
+
+#: ../urpmq:75
+#, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - stampe le liste des modifichis.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - slargje le ricercje a lis dipendencis dal pachet.\n"
+
+#: ../urpmq:78
+#, c-format
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - rimôf il pachet se une version plui atualizade e je dizà "
+"instalade.\n"
+
+#: ../urpmq:80
+#, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - risultâts complets cui pachets di rimovi.\n"
+
+#: ../urpmq:82
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ricercje ledrôse sui recuisîts dal pachet.\n"
+
+#: ../urpmq:85
+#, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - stampe informazions utilis in forme leibile.\n"
+
+#: ../urpmq:86
+#, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - stampe grops ancje cul non\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - stampe le version e le release ancje cui nons.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l         - liste i file presints int'un pachet.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  i nons o file rpm scrits te rie di comant e vegnin interogâs.\n"
+
+#: ../urpmq:150
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes al po sedi doprât dome cun --parallel"
+
+#: ../urpmq:327
+#, c-format
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Par instalâ %s a covente un di chescj pachets:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2002 MandrakeSoft.\n"
+#~ "Chest software al è libar e al po sedi distribuît sot dai termins de GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "ûs:\n"
diff --git a/po/ga.po b/po/ga.po
index f39eba6f..a7d9adac 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -35,678 +35,756 @@ msgstr "TtYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+msgid "installing %s\n"
+msgstr "ag feistiú %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr ""
-
-#: ../urpmi:1
-#, 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:"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "léamh depslist comhad [%s]"
+msgid "Is this OK?"
+msgstr "An bhfuil sin Ok ?"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "Ok"
+msgstr "Ceart go Leor"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr ""
+msgid "Cancel"
+msgstr "Cealaigh"
 
-#: ../urpmi:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Everything already installed"
-msgstr "tá gach rud ann cheana féin"
+msgid " (Y/n) "
+msgstr " (T/n) "
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../_irpm:63
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "using process %d for executing transaction"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Céard é do rogha? (1-%d) "
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "found %d headers in cache"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:79
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "léamh depslist comhad [%s]"
+msgid "syntax error in config file at line %s"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:202
 #, c-format
-msgid "Package installation..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid rpm file name [%s]"
+#: ../urpm.pm:209
+#, fuzzy, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Theip ag feistiú"
-
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-
-#: ../urpm/msg.pm:1
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Droch-rogha, athtrialaigh!\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:249
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Theip ag feistiú"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpme:1
-#, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
+#: ../urpm.pm:271
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: ../urpm.pm:278
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:342
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:343
 #, c-format
-msgid "no package named %s"
-msgstr "pacáiste ar bith den ainm %s"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:368
 #, fuzzy, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+msgid "unable to write config file [%s]"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
+#, fuzzy, c-format
+msgid "write config file [%s]"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:412
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Tá droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:423
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:433
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:437
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown package"
-msgstr "pacáiste ar bith den ainm %s"
+#: ../urpm.pm:452
+#, c-format
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Theip ar feistiú"
+msgid "examining synthesis file [%s]"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+msgid "examining hdlist file [%s]"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "Tá droch ainmchomad rpm [%s]"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:551 ../urpm.pm:1665
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (T/n) "
+msgid "skipping package %s"
+msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:572
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "  -v             - verbose mode.\n"
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid "Initializing..."
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:677
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:681
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+msgid "copying hdlists file..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "léamh depslist comhad [%s]"
+msgid "...copying failed"
+msgstr "Theip ar feistiú"
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Brú Enter nuair atá sin déanta agat..."
-
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:691
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "...retrieving failed: %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
+msgid "removing medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+
+#: ../urpm.pm:996
+#, c-format
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1105
 #, c-format
-msgid "%s: command not found\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "unable to register rpm file"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "Téip cóip do [%s]"
+
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpm.pm:1199
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr ""
+#: ../urpm.pm:1204
+#, fuzzy, c-format
+msgid "no rpm files found from [%s]"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid "retrieving hdlists file..."
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr ""
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "md5sum mismatch"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, fuzzy, c-format
-msgid "syntax error in config file at line %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1579
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1586
+#, fuzzy, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1588
+#, fuzzy, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1679
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1684
+#, fuzzy, c-format
+msgid "building hdlist [%s]"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1745
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1749
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "in order to install %s"
-msgstr ""
+msgid "mounting %s"
+msgstr "ag feistiú %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "ag feistiú %s"
+
+#: ../urpm.pm:1928
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "léamh depslist comhad [%s]"
+msgid "unable to register rpm file"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --url          - print tag url: url.\n"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "no package named %s"
+msgstr "pacáiste ar bith den ainm %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
+
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "installing %s\n"
-msgstr "ag feistiú %s\n"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2378
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "trying to promote %s"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "unable to remove package %s"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2561
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "Missing signature (%s)"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "Tá droch ainmchomad rpm [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (T/n) "
+#: ../urpm.pm:2786
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2794
+#, fuzzy, c-format
+msgid "removing package %s"
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm.pm:2796
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "removing package %s will break your system"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "do you agree ?"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "...retrieving done"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "pacáiste ar bith den ainm %s"
-
-#: ../urpm.pm:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Droch-rogha, athtrialaigh!\n"
 
-#: ../urpmi:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"urpmi version %s\n"
+"urpme version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -714,1116 +792,1070 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "Preparing..."
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:50
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "pacáiste ar bith den ainm %s"
+
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "pacáiste ar bith den ainm %s"
+
+#: ../urpme:93
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../urpme:106
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "Téip cóip do [%s]"
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "Removing failed"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:27
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:38
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "...copying done"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "error registering local packages"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:46
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no rpm files found from [%s]"
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmf:48
+#, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:49
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to install package %s"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:52
 #, c-format
-msgid "Save file"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Tá droch ainmchomad rpm [%s]"
+#: ../urpmf:54
+#, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:55
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:59
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:61
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:62
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:63
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpm.pm:1
+#: ../urpmf:64
 #, c-format
-msgid "unrequested"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:65
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:66
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmq:1
+#: ../urpmi:72
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:82
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "ag feistiú %s"
-
-#: ../urpmi.update:1
+#: ../urpmi:91
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "restarting urpmi"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmi:1
+#: ../urpmi:94
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "Theip ar feistiú"
-
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:96
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "pacáiste ar bith den ainm %s"
-
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:109
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../rpm-find-leaves:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
+#, c-format
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:119
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:120
 #, 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"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:125
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid "Is this OK?"
-msgstr "An bhfuil sin Ok ?"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi:131 ../urpmq:84
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:132
 #, c-format
-msgid "Nothing to remove"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
+#: ../urpmi:134
+#, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:197
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "Copying failed"
-msgstr "theip ar feistiú"
+msgid "Install it"
+msgstr "Theip ag feistiú"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:239
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:240
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+msgid "Copying failed"
+msgstr "theip ar feistiú"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:260
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "ag feistiú %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Tá droch ainmchomad rpm [%s]"
+#: ../urpmi:396
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi:403
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Céard é do rogha? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
+msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Cealaigh"
+#: ../urpmi:461
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:541
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Brú Enter nuair atá sin déanta agat..."
+
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:619
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "Theip ag feistiú"
+
+#: ../urpmi:665
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "ag feistiú %s\n"
+
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "ag feistiú %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:712
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "léamh depslist comhad [%s]"
+msgid "%d installation transactions failed"
+msgstr "Theip ag feistiú"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, fuzzy, c-format
-msgid "copying hdlists file..."
-msgstr "léamh depslist comhad [%s]"
+msgid "Installation is possible"
+msgstr "Theip ar feistiú"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "tá gach rud ann cheana féin"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "ag feistiú %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi.addmedia:72
+#, c-format
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "retrieving mirrors at %s ..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:34
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "Tá droch ainmchomad rpm [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi.removemedia:48
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ag feistiú %s\n"
+#: ../urpmi.update:28
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Theip ag feistiú"
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "léamh depslist comhad [%s]"
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:38
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:53
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:54
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:55
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:58
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:60
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "in order to keep %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:65
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:75
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "urpmi database locked"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "léamh depslist comhad [%s]"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "Theip ar feistiú"
 
diff --git a/po/gl.po b/po/gl.po
index c42745ba..fe78bf40 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2000-05-09 23:50+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -36,1799 +36,1831 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+msgid "installing %s\n"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr ""
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Necesítase un dos seguintes paquetes:"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+msgid "Is this OK?"
+msgstr "¿Está ben?"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr ""
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpmi:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Everything already installed"
-msgstr "xa está todo instalado"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../_irpm:63
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "using process %d for executing transaction"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "¿Cal é a súa elección? (1-%d) "
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "found %d headers in cache"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:79
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "syntax error in config file at line %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:202
 #, c-format
-msgid "Package installation..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpm.pm:209
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "A instalación fallou"
+#: ../urpm.pm:222
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mala elección, probe de novo\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Choose location to save file"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:262
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:271
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:278
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes paquetes conteñen %s: %s\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "A instalación fallou"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Necesítase un dos seguintes paquetes:"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "taking removable device as \"%s\""
 msgstr ""
-"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
-"d MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr ""
+
+#: ../urpm.pm:368
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
+msgid "unable to write config file [%s]"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:390
+#, fuzzy, c-format
+msgid "write config file [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no package named %s"
-msgstr "non hai ningún paquete co nome %s\n"
+#: ../urpm.pm:423
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "non hai ningún paquete co nome %s\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
+#, c-format
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
+
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "A instalación fallou"
+msgid "skipping package %s"
+msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "Os seguintes paquetes conteñen %s: %s\n"
+msgid "would install instead of upgrade package %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "unable to open rpmdb"
 msgstr ""
-"Para satisfacer as dependencias, os seguintes %d paquetes van ser instalados "
-"(%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:622
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (S/n) "
-
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --all          - print all tags.\n"
-msgstr ""
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "A instalación fallou"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "retrieving hdlists file..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Prema enter cando estea..."
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
+msgid "...retrieving failed: %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+#: ../urpm.pm:783
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr ""
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "retrieving hdlists file..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "A instalación fallou"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr ""
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid "syntax error in config file at line %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1398
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, fuzzy, c-format
-msgid "in order to install %s"
+msgid "no hdlist file found for medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
+#: ../urpm.pm:1541
+#, fuzzy, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+#: ../urpm.pm:1579
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
+msgid "writing list file for medium \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1588
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "nothing written in list file for \"%s\""
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmq:1
+#: ../urpm.pm:1679
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:1745
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
+#: ../urpm.pm:1893
+#, fuzzy, c-format
+msgid "mounting %s"
 msgstr "instalando %s\n"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1906
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "instalando %s\n"
+
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "trying to promote %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, fuzzy, c-format
-msgid "unable to remove package %s"
+msgid "invalid rpm file name [%s]"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "retrieving rpm file [%s] ..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "Missing signature (%s)"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "non hai ningún paquete co nome %s\n"
+
+#: ../urpm.pm:2079 ../urpme:88
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes paquetes conteñen %s: %s\n"
+
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:2362
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "a petición á base de datos rpm fallou\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:2561
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:2635
 #, c-format
 msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:2642
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "removing package %s will break your system"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+#: ../urpm.pm:2794
+#, fuzzy, c-format
+msgid "removing package %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi:1
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:2806
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2809
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "do you agree ?"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "in order to keep %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpm.pm:3035
+#, fuzzy, c-format
+msgid "in order to install %s"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "...retrieving done"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "non hai ningún paquete co nome %s\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mala elección, probe de novo\n"
 
-#: ../urpm.pm:1
+#: ../urpme:36
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "Preparing..."
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:50
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "A instalación fallou"
+msgid "unknown packages"
+msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../urpmq:1
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "non hai ningún paquete co nome %s\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:93
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpmf:1
+#: ../urpme:106
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
+"d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (S/n) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+
+#: ../urpme:115
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:27
 #, c-format
 msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "...copying done"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "error registering local packages"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes paquetes conteñen %s: %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmq:1
+#: ../urpmf:44
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "Save file"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpme:1
+#: ../urpmf:48
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:50
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:52
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:54
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:55
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Necesítase un dos seguintes paquetes:"
-
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unrequested"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:59
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:61
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmf:63
+#, c-format
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:64
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:66
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:114
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "instalando %s\n"
-
-#: ../urpmi.update:1
+#: ../urpmi:72
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:85
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "A instalación fallou"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "non hai ningún paquete co nome %s\n"
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "¿Está ben?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi:204
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "a instalación fallou"
+#: ../urpmi:213
+#, c-format
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+msgid "Install it"
+msgstr "A instalación fallou"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+
+#: ../urpmi:240
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "instalando %s\n"
+msgid "Copying failed"
+msgstr "a instalación fallou"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
+msgid "Only superuser is allowed to install packages"
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
+msgid "One of the following packages is needed:"
+msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "What is your choice? (1-%d) "
+msgstr "¿Cal é a súa elección? (1-%d) "
+
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
+msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../urpmi:461
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "Os seguintes paquetes conteñen %s: %s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Para satisfacer as dependencias, os seguintes %d paquetes van ser instalados "
+"(%d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor, insira o %s nomeado %s"
+
+#: ../urpmi:541
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Prema enter cando estea..."
+
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:619
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes paquetes conteñen %s: %s\n"
+
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "A instalación fallou"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+#: ../urpmi:665
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "instalando %s\n"
 
-#: ../urpmf:1
-#, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "instalando %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+msgid "%d installation transactions failed"
+msgstr "A instalación fallou"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "A instalación fallou"
+
+#: ../urpmi:783
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Everything already installed"
+msgstr "xa está todo instalado"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "instalando %s\n"
+#: ../urpmi.addmedia:57
+#, c-format
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi.addmedia:67
+#, c-format
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
+
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "retrieving mirrors at %s ..."
 msgstr "Só se lle permite ó superusuario instalar paquetes locais"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "unable to create transaction"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "instalando %s\n"
-
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "A instalación fallou"
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor, insira o %s nomeado %s"
+#: ../urpmq:38
+#, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:53
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:54
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:55
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
+#: ../urpmq:58
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:62
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpm.pm:1
+#: ../urpmq:65
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:75
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "urpmi database locked"
-msgstr "a petición á base de datos rpm fallou\n"
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "Só se lle permite ó superusuario instalar paquetes locais"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Necesítase un dos seguintes paquetes:"
+
+#, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "A instalación fallou"
 
diff --git a/po/he.po b/po/he.po
index 82e4aa70..2e435ee1 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-27 23:02+0300\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -44,850 +44,765 @@ msgstr "כfFטyY"
 msgid "Nn"
 msgstr "לkKמnN"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - יצירה אוטומטית של כל המקורות מתקליטורי ההתקנה\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to open rpmdb"
-msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
+msgid "installing %s\n"
+msgstr "מתקין %s\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - הצגת הודעת עזרה זו.\n"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"התקנה אוטומטית של החבילות ... \n"
+"ביקשת התקנה של החבילות %s\n"
 
-#: ../urpmi:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "אחת החבילות הבאות נדרשת להתקנת %s:"
+msgid "Is this OK?"
+msgstr "האם זה בסדר?"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "removing package %s"
-msgstr "מסיר חבילה %s"
+msgid "Ok"
+msgstr "אישור"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "Cancel"
+msgstr "ביטול"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "אין אפשרות להפעיל אופן מקבילי ביחד עם אופן פעולה use-distrib"
+msgid " (Y/n) "
+msgstr "אישור/ביטול (*כ/ל) "
 
-#: ../urpmi:1
+#: ../_irpm:63
 #, c-format
-msgid "Everything already installed"
-msgstr "הכל כבר מותקן"
+msgid "%s: command not found\n"
+msgstr "%sפקודה לא נמצאה \n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ניקוי ספריית מטמון כותרים.\n"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"שימוש: %s [options]\n"
+"כאשר [options] הם מתוך\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "משתמש בתהליך %d כדי לבצע את הפעולה"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - הצגת הודעת עזרה זו.\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - print tag provides: all provides.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - הגבלת התוצאות לקבוצה (group) מסויימת.\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "מה היא בחירתך? (1-%d)"
+msgid "                    defaults is %s.\n"
+msgstr "                    ברירת המחדל היא %s.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "found %d headers in cache"
-msgstr "נמצאו %d כותרים במטמון"
+msgid "unknown protocol defined for %s"
+msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ישנן הרבה חבילות RPM עם אותו שם קובץ \"%s\""
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:95
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "unable to handle protocol: %s"
+msgstr "השימוש בפרוטוקול : %s נכשל"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "מבצע מעבר שני בכדי לחשב תלויות\n"
+msgid "syntax error in config file at line %s"
+msgstr "התגלתה שגיאה בשורה %s בקובץ ההגדרות"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "מאחזר קובץ RPM [%s]..."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "מאגר \"%s\" מנסה להשתמש ב-hdlist שכבר בשימוש, התעלמות מאגר"
 
-#: ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list available parallel aliases.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "המאגר \"%s\" מנסה להשתמש ברשימה שכבר בשימוש, מתעלם ממאגר"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:196
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...האיחזור נכשל: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "לא ניתן להגדיר מקור \"%s\" מאחר וקובץ הרשימה כבר נמצא בשימוש מקור אחר"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "אין אפשרות לבחון את רשימת הקבצים \"%s\", התעלמות מאגר"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"unable to use name \"%s\" for unnamed medium because it is already used"
 
-#: ../urpmf:1
+#: ../urpm.pm:209
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "אין אפשרות לקחת את המאגר \"%s\" בחשבון כאשר רשימת הקבצים [%s] לא קיימת"
 
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Package installation..."
-msgstr "התקנת חבילה..."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "אין אפשרות לקבוע מאגר של קובץ ה-hdlist [%s] הזה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "שם החבילה [%s] אינו תקין"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "אין אפשרות לגשת לקובץ hdlist של \"%s\", מדיה זו לא תהיה בשימוש"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "אין אפשרות גישה לקובץ הרשימה של \"%s\", מדיה זו לא תהיה בשימוש"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d עסקת התקנה נכשלה"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "מנסה לדלג על המקור הנוכחי \"%s\", מתחמק"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"גישה להתקנה הראשונה של המאגר בלתי אפשרות (הקובץ Mandrake/base/hdlists לא "
-"נמצא)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "מאגר וירטואלי \"%s\" לא הגדיר  hdlist או רשימת קבצים, התעלמות מאגר"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "מאגר וירטואלי \"%s\" צריך שיהיה לו כתובת ברורה, התעלמות מאגר"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Choose location to save file"
-msgstr "עליך לבחור מקום לשמירת הקובץ"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "אין אפשרות למצוא קובץ hdlist עבור \"%s\", התעלמות מאגר"
 
-#: ../urpmf:1
+#: ../urpm.pm:278
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - print tag summary: summary.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "אין אפשרות למצוא קובץ רשימה עבור \"%s\", התעלמות מאגר"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:301
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "The following packages contain %s: %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "רשימת קבצים לא רציפה \"%s\", התעלמות מאגר"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Install it"
-msgstr "התקנן זאת"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "אין אפשרות לבחון את רשימת הקבצים \"%s\", התעלמות מאגר"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - use X interface.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "יותר מדי נקודות חיבור עבור מאגר נייד \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "אחת החבילות הבאות נדרשת:"
+msgid "taking removable device as \"%s\""
+msgstr "לוקח התקן נייד כ - \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "בכדי לענות על התלויות, החבילות הבאות יימחקו (%d MB)"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "משתמש בהתקן נייד אחר [%s] עבור \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "אין אפשרות לייבא את המסלול עבור מאגר הניתנת להסרה \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "מוריד חבילה `%s'..."
+msgid "unable to write config file [%s]"
+msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "מה יכול להיעשות עם קובצי RPM כשמשתמשים --install-src"
+msgid "write config file [%s]"
+msgstr "כתיבת קובץ הגדרות [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "אין אפשרות להפעיל אופן מקבילי ביחד עם אופן פעולה use-distrib"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
 #, c-format
-msgid "no package named %s"
-msgstr "לא נמצאה חבילה בשם %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "אין אפשרות לפענח את \"%s\" בקובץ [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - select all matches on command line.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "בודק את המזהה המקבילי בקובץ [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
-"ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
-"%s\n"
-"יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "משתמש במדיה מקושרת עבור מצב מקבילי: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "אין אפשרות להשתמש באפשרות המקבילה \"%s\""
+
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"ההתקנה לא יכולה להמשיך בגלל החבילות הבאות\n"
-"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
-"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' חסר עבור מדית רשת\n"
+msgid "examining synthesis file [%s]"
+msgstr "בודק את קובץ הsynthesis [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr ""
+msgid "examining hdlist file [%s]"
+msgstr "בודק את הקובץ hdlist [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "חבילה לא מוכרת"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "מאגר וירטואלי \"%s\" לא מקומי, התעלמות מאגר"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "Installation is possible"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "בעיה בקריאת hdlist או קובץ מיזוג של המאגר \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "מבצע מעבר שני בכדי לחשב תלויות\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "בכדי לספק את התלויות, %d החבילות הבאות יותקנו (%d MB)"
+msgid "skipping package %s"
+msgstr "מדלג על חבילה %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "אין אפשרות לקחת את המאגר \"%s\" בחשבון כאשר רשימת הקבצים [%s] לא קיימת"
+msgid "would install instead of upgrade package %s"
+msgstr "האם להתקין במקום לשדרג את החבילה %s"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr " (כן/*לא) "
+msgid "unable to open rpmdb"
+msgstr "אין אפשרות לפתוח את בסיס הנתונים של החבילות rpmdb"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "לא יכול להוסיף עדכונים של הפצת cooker\n"
+msgid "medium \"%s\" already exists"
+msgstr "המאגר \"%s\" כבר קיים"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose mode.\n"
+msgid "virtual medium need to be local"
+msgstr "מאגר וירטואלי צריך להיות מקומי"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "מאתחל..."
+msgid "added medium %s"
+msgstr "מאגר %s הוסף"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - list available packages.\n"
+msgid "unable to access first installation medium"
+msgstr "אין אפשרות גישה למאגר ההתקנה הראשון"
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - print all tags.\n"
+msgid "copying hdlists file..."
+msgstr "מעתיק קובץ hdlists..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל לא באמת"
+msgid "...copying failed"
+msgstr "...ההעתקה נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "מאגר וירטואלי \"%s\" לא הגדיר  hdlist או רשימת קבצים, התעלמות מאגר"
+msgid "...copying done"
+msgstr "...ההעתקה הסתיימה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "חישוב md5sum של מקור hdlist (או synthesis) מועתקים"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"גישה להתקנה הראשונה של המאגר בלתי אפשרות (הקובץ Mandrake/base/hdlists לא "
+"נמצא)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclude path separated by comma.\n"
+msgid "retrieving hdlists file..."
+msgstr "מאחזר את הקובץ hdlists ..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "נא להקיש Enter"
+msgid "...retrieving done"
+msgstr "...האחזור הסתיים"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"unknown options '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...האיחזור נכשל: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "בעיה בקריאת hdlist או קובץ מיזוג של המאגר \"%s\""
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - use wget to retrieve distant files.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - allow search in provides to find package.\n"
+msgid "selecting multiple media: %s"
+msgstr "בוחר הרבה מדיה:%s"
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "בונה hdlist [%s]"
+msgid "removing medium \"%s\""
+msgstr "מסיר מאגר \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining MD5SUM file"
-msgstr "בודק את קובץ החתימות MD5SUM"
+"אין אפשרות לגשת למאגר \"%s\",\n"
+"זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
 
-#: ../_irpm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%sפקודה לא נמצאה \n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"מאגר וירטואלי \"%s\" צריך שיהיה לו מקור hdlist או מיזוג בר תוקף, מתעלם ממאגר"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "unable to register rpm file"
-msgstr "אין אפשרות לבצע רישום של החבילה"
+msgid "copying description file of \"%s\"..."
+msgstr "מעתיק תיאור קובץ של \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "מחשב MD5SUM של hdlist (או synthesis) של המקור"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "השימוש בפרוטוקול : %s נכשל"
+msgid "examining MD5SUM file"
+msgstr "בודק את קובץ החתימות MD5SUM"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "מאחזר את הקובץ hdlists ..."
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "מעתיק מקור hdlist (או מיזוג) של \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "Yes, really install it"
-msgstr "כן, אנא התקן זאת"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "added medium %s"
-msgstr "מאגר %s הוסף"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "חישוב md5sum של מקור hdlist (או synthesis) מועתקים"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - keep rpm not used in cache.\n"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "העתקת [%s] נכשלה (חתימת md5sum אינה תואמת)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "md5sum mismatch"
-msgstr "אי התאמה של md5sum"
+msgid "reading rpm files from [%s]"
+msgstr "מייבא חבילות מ [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "התגלתה שגיאה בשורה %s בקובץ ההגדרות"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "אין אפשרות לקרוא את קובצי ה-RPM מ [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
+msgid "no rpm files found from [%s]"
+msgstr "לא נמצאו חבילות מ [%s]"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "in order to install %s"
-msgstr "בכדי להתקין %s"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "נמצא hdlist (או מיזוג) בחון כ-%s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignore case distinctions in every pattern.\n"
+msgid "md5sum mismatch"
+msgstr "אי התאמה של md5sum"
 
-#: ../urpmi:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "אחזור של רשימת hdlist (או synthesis) נכשל"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "האם להתקין במקום לשדרג את החבילה %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "לא נמצאו קובצי hdlist עבור מאגר \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "מאחזר אתרי מראה ב- %s ..."
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "הקובץ [%s] כבר משומש באותו מאגר \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - print tag url: url.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "אין אפשרות לפענח את קובץ ה-hdlist של \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "פרוטוקול לא מזוהה הוגדר עבור %s"
+msgid "unable to write list file of \"%s\""
+msgstr "אין אפשרות לכתוב את קובץ הרשימה של \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - print version and release with name also.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "כותב קובץ רשימה עבור מאגר \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "לא נכתב דבר ברשימת הקובץ עבור \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "המאגר \"%s\" כבר קיים"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "installing %s\n"
-msgstr "מתקין %s\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1613
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"לא חסרה שום כניסה המיועדת לעדכון\n"
-"(אחד מ %s)\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "trying to promote %s"
-msgstr "מנסה לקדם %s"
+msgid "reading headers from medium \"%s\""
+msgstr "קורא כותרות מתוך מאגר \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "unable to remove package %s"
-msgstr "הסרת החבילה %s נכשלה"
+msgid "building hdlist [%s]"
+msgstr "בונה hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"שום כניסה המיועדת להסרה אינה חסרה\n"
-"(אחד מ %s)\n"
+msgid "found %d headers in cache"
+msgstr "נמצאו %d כותרים במטמון"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - select all media.\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "מסיר %d ספקי כותרות במטמון"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "חתימה חסרה (%s)"
+msgid "mounting %s"
+msgstr "מחבר את %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "אין אפשרות לקרוא את קובצי ה-RPM מ [%s]: %s"
+msgid "unmounting %s"
+msgstr "מנתק את %s"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - update only update media.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "שם החבילה [%s] אינו תקין"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1948
 #, c-format
-msgid " (Y/n) "
-msgstr "אישור/ביטול (*כ/ל) "
+msgid "retrieving rpm file [%s] ..."
+msgstr "מאחזר קובץ RPM [%s]..."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - הגבלת התוצאות לקבוצה (group) מסויימת.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "הגישה לחבילה [%s] נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "המאגר \"%s\" מנסה להשתמש ברשימה שכבר בשימוש, מתעלם ממאגר"
+msgid "unable to register rpm file"
+msgstr "אין אפשרות לבצע רישום של החבילה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "קלט לא תקין: [%s]"
+msgid "error registering local packages"
+msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
 
-#: ../urpme:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "הסרת החבילה %s תגרום נזק למערכת"
+msgid "no package named %s"
+msgstr "לא נמצאה חבילה בשם %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - list available media.\n"
+msgid "The following packages contain %s: %s"
+msgstr "The following packages contain %s: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"לא יכול להתקין כמה חבילות מבוקשות:\n"
-"%s"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ישנן הרבה חבילות RPM עם אותו שם קובץ \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "מתקין חבילה `%s' (%s/%s)..."
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "פענוח [%s] נכשל בערך \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "no entries relocated in depslist"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
+"מאגר \"%s\" משתמש בקובץ רשימה לא תקף:\n"
+"  המראה קרוב לוודאי לא עדכנית, נסה להשתמש בשיטה חלופית"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - install only source package (no binaries).\n"
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - use curl to retrieve distant files.\n"
-
-#: ../urpmf:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "מאגר \"%s\" לא הגדיר מיקום כלשהו עבור קובצי RPM"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "do you agree ?"
-msgstr "האם אתה מסכים ?"
+msgid "package %s is not found."
+msgstr "החבילה %s לא נמצאה."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "רשימת קבצים לא רציפה \"%s\", התעלמות מאגר"
+msgid "urpmi database locked"
+msgstr "בסיס הנתונים של urpmi נעול"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "...retrieving done"
-msgstr "...האחזור הסתיים"
+msgid "medium \"%s\" is not selected"
+msgstr "מאגר \"%s\" לא נבחר"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "מוסיף חבילה %s (id=%d, eid=%d, עדכון=%d, קובץ=%s)"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "אין אפשרות לקרוא את קובץ ה-RPM [%s] מ \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "skipping package %s"
-msgstr "מדלג על חבילה %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "מאגר לא רציף \"%s\" מסומן כניתן למחיקה אבל לא באמת"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "חתימה לא תקפה (%s)"
+msgid "unable to access medium \"%s\""
+msgstr "הגישה למדיה \"%s\" נכשלה"
 
-#: ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  שמות או קובצי RPM שניתנו בשורת הפקודה נמצאים בסימן שאלה.\n"
+msgid "malformed input: [%s]"
+msgstr "קלט לא תקין: [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:2642
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
-"urpmi גרסה%s\n"
-"כל הזכויות שמורות (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL\n"
-"\n"
-"שימוש:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "פענוח [%s] נכשל בערך \"%s\""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "Preparing..."
+msgstr "הכנה..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "אין אפשרות לקבוע מאגר של קובץ ה-hdlist [%s] הזה"
+msgid "using process %d for executing transaction"
+msgstr "משתמש בתהליך %d כדי לבצע את הפעולה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "אין אפשרות לפענח את קובץ ה-hdlist של \"%s\""
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "יצר עסקה עבור התקנה על %s (הסרה=%d, התקנה=%d, עדכון=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "מאגר \"%s\" מנסה להשתמש ב-hdlist שכבר בשימוש, התעלמות מאגר"
+msgid "unable to create transaction"
+msgstr "בלתי אפשרי לעשות עסקה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "עקב התנגשות עם %s"
+msgid "removing package %s"
+msgstr "מסיר חבילה %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "מסיר %d ספקי כותרות במטמון"
+msgid "unable to remove package %s"
+msgstr "הסרת החבילה %s נכשלה"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "עדכון המאגר \"%s\" נכשל\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "מוסיף חבילה %s (id=%d, eid=%d, עדכון=%d, קובץ=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
+msgid "unable to install package %s"
+msgstr "התקנת החבילה %s נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "מאגר וירטואלי \"%s\" לא מקומי, התעלמות מאגר"
+msgid "due to missing %s"
+msgstr "עקב %s חסר"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "הכנה..."
+msgid "due to unsatisfied %s"
+msgstr "עקב תלות %s שלא מולאה"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    ברירת המחדל היא %s.\n"
+msgid "trying to promote %s"
+msgstr "מנסה לקדם %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "משתמש בהתקן נייד אחר [%s] עבור \"%s\""
+msgid "in order to keep %s"
+msgstr "בכדי לשמור %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "in order to install %s"
+msgstr "בכדי להתקין %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - do not search in provides to find package.\n"
+msgid "due to conflicts with %s"
+msgstr "עקב התנגשות עם %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "העתקת [%s] נכשלה (חתימת md5sum אינה תואמת)"
+msgid "unrequested"
+msgstr "לא התבקש"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "חתימה לא תקפה (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"שימוש: %s [options]\n"
-"כאשר [options] הם מתוך\n"
+msgid "Invalid Key ID (%s)"
+msgstr "מפתח זהות לא תקין (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Missing signature (%s)"
+msgstr "חתימה חסרה (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "bad proxy declaration on command line\n"
+msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"מאגר וירטואלי \"%s\" צריך שיהיה לו מקור hdlist או מיזוג בר תוקף, מתעלם ממאגר"
+msgid "Sorry, bad choice, try again\n"
+msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -903,1034 +818,1165 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - הצגת הודעת עזרה זו.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "מעתיק מקור hdlist (או מיזוג) של \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...ההעתקה הסתיימה"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - וידוי שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "אין אפשרות להשתמש באפשרות המקבילה \"%s\""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"מאגר \"%s\" משתמש בקובץ רשימה לא תקף:\n"
-"  המראה קרוב לוודאי לא עדכנית, נסה להשתמש בשיטה חלופית"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "אין אפשרות גישה למאגר ההתקנה הראשון"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "מאגר וירטואלי צריך להיות מקומי"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "error registering local packages"
-msgstr "חלה שגיאה בעת רישום חבילות מקומיות"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose mode.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:50
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limit the download speed.\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "נמצא hdlist (או מיזוג) בחון כ-%s"
+msgid "unknown packages"
+msgstr "חבילות לא מוכרות"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "אחזור של רשימת hdlist (או synthesis) נכשל"
+msgid "unknown package"
+msgstr "חבילה לא מוכרת"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "לא נמצאו חבילות מ [%s]"
+msgid "removing package %s will break your system"
+msgstr "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "לא נכתב דבר ברשימת הקובץ עבור \"%s\""
+msgid "Nothing to remove"
+msgstr "שום-דבר למחיקה"
 
-#: ../urpmi:1
+#: ../urpme:99
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "לחבילות הבאות יש בעיה בחתימות"
+msgid "Checking to remove the following packages"
+msgstr "בדיקה להסרה של החבילות הבאות"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "מחשב MD5SUM של hdlist (או synthesis) של המקור"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "בכדי לענות על התלויות, החבילות הבאות יימחקו (%d MB)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
+msgid " (y/N) "
+msgstr " (כן/*לא) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "unable to install package %s"
-msgstr "התקנת החבילה %s נכשלה"
+msgid "removing %s"
+msgstr "מסיר %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "ההסרה נכשלה"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
-"                   בלי בדיקת תלויות.\n"
+"גרסת urpmf %s\n"
+"כל הזכויות שמורות (C) 2002 MandrakeSoft.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
+"\n"
+"\n"
+"שימוש:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "שמירת הקובץ"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - שימוש ברשימת המקורות המופרדים ע\"י פסיק בלבד\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "מפתח זהות לא תקין (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - השתמש במיזוג שניתן במקום urpmi db.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet        - אל תדפיס את שם התג (ברירת מחדל אם שום תג לא ניתן בשורת\n"
+"                   הפקודה, ההפך ממצב אינראקטיבי).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "אין אפשרות לייבא את המסלול עבור מאגר הניתנת להסרה \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - לא מדפיס שורות זהות.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - print all tags.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - הדפסת קבוצת התג: קבוצה.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - הדפסת גודל התג: גודל.\n"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - הדפסת תקופת התג: תקופה.\n"
+
+#: ../urpmf:46
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - print tag summary: summary.\n"
+
+#: ../urpmf:47
+#, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
+
+#: ../urpmf:48
+#, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:49
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "חסר <relative path of hdlist>\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - הדפסת אורז התג: אורז.\n"
 
-#: ../urpme:1
+#: ../urpmf:50
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "בדיקה להסרה של החבילות הבאות"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unrequested"
-msgstr "לא התבקש"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "הגישה לחבילה [%s] נכשלה"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - print tag provides: all provides.\n"
 
-#: ../urpmf:1
+#: ../urpmf:53
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - הדפסת קובצי התג: כל הקבצים.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - הדפסת דרישות התג: כל הדרישות.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "אין אפשרות לפענח את \"%s\" בקובץ [%s]"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - הדפסת קובצי התג: כל הקבצים.\n"
 
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "האם להמשיך בתהליך ההתקנה?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "אין אפשרות לקרוא את קובץ ה-RPM [%s] מ \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr ""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignore case distinctions in every pattern.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr "d.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -a             - אופרטור AND בינארי, אמת אם שני הביטויים הם אמת.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - שלילה של מרכיב, אמת אם ביטוי הוא שקר.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - סוגר שמאלי כדי לפתוח קבוצת ביטויים.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - סוגר ימני כדי לסגור קבוצת ביטויים.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
+"הקריאה היא :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "מנתק את %s"
+msgid "using specific environment on %s\n"
+msgstr "שימוש בסביבה מסוימת על  %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% הושלם, מהירות = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi גרסה%s\n"
+"כל הזכויות שמורות (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL\n"
+"\n"
+"שימוש:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "בודק את קובץ הsynthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...ההעתקה נכשלה"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "אין אפשרות לגשת לקובץ hdlist של \"%s\", מדיה זו לא תהיה בשימוש"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - מצב שקט.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      -נותן כל חבילות המקור לפני הורדה (רק מנהל מערכת).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - תמצית כותרות עבור חבילות רשומות עבור urpmi db to\n"
-"                   stdout (רק מנהל מערכת).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - install only source package (no binaries).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "חבילות לא מוכרות"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "בוחר הרבה מדיה:%s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - keep rpm not used in cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "הקובץ [%s] כבר משומש באותו מאגר \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
+"                   בלי בדיקת תלויות.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "אין מה להסיר (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "אין אפשרות למצוא קובץ רשימה עבור \"%s\", התעלמות מאגר"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - use wget to retrieve distant files.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - הצגת הודעת עזרה זו.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - use curl to retrieve distant files.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr ""
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limit the download speed.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"הקריאה היא :\n"
-"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"גרסת urpmf %s\n"
-"כל הזכויות שמורות (C) 2002 MandrakeSoft.\n"
-"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
-"\n"
-"\n"
-"שימוש:\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - אל תדפיס את שם התג (ברירת מחדל אם שום תג לא ניתן בשורת\n"
-"                   הפקודה, ההפך ממצב אינראקטיבי).\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - לא מדפיס שורות זהות.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - use X interface.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - השתמש בארכיטקטורה מסוימת, ברירת המחדל היא\n"
-"                   mandrake-release package installed.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "האם זה בסדר?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclude path separated by comma.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - השתמש במיזוג שניתן במקום urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - select all matches on command line.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "בודק את המזהה המקבילי בקובץ [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - allow search in provides to find package.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "שום-דבר למחיקה"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - do not search in provides to find package.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "קורא כותרות מתוך מאגר \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - החבילה הבאה היא חבילת מקור (אותו הדבר כמו --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - מצב שקט.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr " שמות או קובצי RPM שניתנו בשורת הפקודה יותקנו.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "מאגר \"%s\" לא הגדיר מיקום כלשהו עבור קובצי RPM"
+msgid "Choose location to save file"
+msgstr "עליך לבחור מקום לשמירת הקובץ"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "מה יכול להיעשות עם קובצי RPM כשמשתמשים --install-src"
+
+#: ../urpmi:204
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "אין אפשרות לכתוב את קובץ הרשימה של \"%s\""
+msgid "Do nothing"
+msgstr "אל תעשה כלום"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - הדפסת דרישות התג: כל הדרישות.\n"
+msgid "Yes, really install it"
+msgstr "כן, אנא התקן זאת"
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
+msgid "Save file"
+msgstr "שמירת הקובץ"
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - הדפסת תיאור התג: תיאור.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
 #, c-format
-msgid "Copying failed"
-msgstr "ההעתקה נכשלה"
+msgid "Install it"
+msgstr "התקנן זאת"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:239
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:240
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "יצירת הספרייה. [%s] עבור דיווחי תקלות נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "לא נמצאו קובצי hdlist עבור מאגר \"%s\""
+msgid "Copying failed"
+msgstr "ההעתקה נכשלה"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:260
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - החבילה הבאה היא חבילת מקור (אותו הדבר כמו --src).\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "רק משתמש בעל הרשאות משתמש-על מורשה להתקין חבילות"
 
-#: ../urpmi:1
+#: ../urpmi:396
 #, c-format
-msgid "installing %s"
-msgstr "מתקין %s"
+msgid "One of the following packages is needed:"
+msgstr "אחת החבילות הבאות נדרשת:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "מייבא חבילות מ [%s]"
+msgid "What is your choice? (1-%d) "
+msgstr "מה היא בחירתך? (1-%d)"
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "מעתיק תיאור קובץ של \"%s\"..."
+msgid "Package installation..."
+msgstr "התקנת חבילה..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - בחירה אוטומטית של חבילה מהאפשרויות.\n"
+msgid "Initializing..."
+msgstr "מאתחל..."
 
-#: ../urpme:1
+#: ../urpmi:435
 #, c-format
-msgid "Removing failed"
-msgstr "ההסרה נכשלה"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"לא יכול להתקין כמה חבילות מבוקשות:\n"
+"%s"
+
+#: ../urpmi:440 ../urpmi:466
+#, c-format
+msgid "do you agree ?"
+msgstr "האם אתה מסכים ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - יצירת מדיה וירטואלית שתמיד עדכנית,\n"
-"                   רק פרוטוקול file:// מורשה.\n"
+"ההתקנה לא יכולה להמשיך בגלל החבילות הבאות\n"
+"יש צורך להסיר אותן, בכדי לשדרג את האחרות:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "החבילה %s לא נמצאה."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"החבילות הבאות עומדות להימחק בכדי שניתן יהיה לשדרג חבילות אחרות: \n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "מסיר מאגר \"%s\""
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "בכדי לספק את התלויות, %d החבילות הבאות יותקנו (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"יש צורך בהרשאות מנהל מערכת בכדי להתקין את התלויות הבאות: \n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "ביטול"
+msgid "unable to get source packages, aborting"
+msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - החבילה הבאה היא חבילת מקור (אותו הדבר כמו -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "נא להכניס את המדיה הנקראת \"%s\"  להתקן [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+msgid "Press Enter when ready..."
+msgstr "נא להקיש Enter"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
+msgid "Downloading package `%s'..."
+msgstr "מוריד חבילה `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "הגישה למדיה \"%s\" נכשלה"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "הוספת המאגר \"%s\" נכשל\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% הושלם, מהירות = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - הדפסת אורז התג: אורז.\n"
+msgid "The following packages have bad signatures"
+msgstr "לחבילות הבאות יש בעיה בחתימות"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "Do you want to continue installation ?"
+msgstr "האם להמשיך בתהליך ההתקנה?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"יש צורך בהרשאות מנהל מערכת בכדי להתקין את התלויות הבאות: \n"
+"ההתקנה נכשלה מכיוון שכמה קבצים חסרים:\n"
 "%s\n"
+"יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "ההתקנה נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "אין אפשרות גישה לקובץ הרשימה של \"%s\", מדיה זו לא תהיה בשימוש"
+msgid "distributing %s"
+msgstr "מפיץ %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - סוגר ימני כדי לסגור קבוצת ביטויים.\n"
+msgid "installing %s"
+msgstr "מתקין %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "לא נמצא webfetch מבין אלו הנתמכים: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "מתקין חבילה `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "בודק את הקובץ hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "האם לנסות להתקין ללא בדיקת תלויות? (כן/*לא)"
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "מעתיק קובץ hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "האם לנסות להתקין תוך אילוץ תלויות (--force)? (כן/לא) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "כותב קובץ רשימה עבור מאגר \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d עסקת התקנה נכשלה"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "מאגר וירטואלי \"%s\" צריך שיהיה לו כתובת ברורה, התעלמות מאגר"
+msgid "Installation is possible"
+msgstr "Installation is possible"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "הכל כבר מותקן"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "אל תעשה כלום"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - הגדרת מאגר עדכון.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "משתמש במדיה מקושרת עבור מצב מקבילי: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "מחבר את %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "לא ניתן להגדיר מקור \"%s\" מאחר וקובץ הרשימה כבר נמצא בשימוש מקור אחר"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - יצירה אוטומטית של כל המקורות מתקליטורי ההתקנה\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
+"  --distrib-XXX  - יוצר אוטומטית מאגר עבור חלק XXX של\n"
+"                   הפצה, XXX יכול להיות ראשי, תרומה, עדכון או\n"
+"                   כל דבר אחר שהוגדר ;-)\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s הושלם זמן הגעה= %s, מהירות= %s"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
+"  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr "d.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - לעולם אל תבקש להסיר התקנה של חבילה, בטל את ההתקנה.\n"
+"  --arch         - השתמש בארכיטקטורה מסוימת, ברירת המחדל היא\n"
+"                   mandrake-release package installed.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"גרסת urpmq %s\n"
-"כל הזכויות שמורות (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"זוהי תוכנה חופשית הניתנת להפצה על-פי תנאי רישיון ה GNU GPL\n"
-"\n"
-"שימוש:\n"
+"  --virtual      - יצירת מדיה וירטואלית שתמיד עדכנית,\n"
+"                   רק פרוטוקול file:// מורשה.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr ""
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ניקוי ספריית מטמון כותרים.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "מאגר \"%s\" לא נבחר"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "רק משתמש בעל הרשאות משתמש-על מורשה להתקין חבילות"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "לא יכול להוסיף עדכונים של הפצת cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "שימוש בסביבה מסוימת על  %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "מאחזר אתרי מראה ב- %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "אין אפשרות למצוא קובץ hdlist עבור \"%s\", התעלמות מאגר"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "no need to give <relative path of hdlist> with --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "עדכון המאגר \"%s\" נכשל\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - סוגר שמאלי כדי לפתוח קבוצת ביטויים.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "חסר <relative path of hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "יותר מדי נקודות חיבור עבור מאגר נייד \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' חסר עבור מדית רשת\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - אופרטור AND בינארי, אמת אם שני הביטויים הם אמת.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "הוספת המאגר \"%s\" נכשל\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"אין אפשרות לגשת למאגר \"%s\",\n"
-"זה יכול לקרות אם היית מחובר ידנית לספרייה בזמן יצירת המאגר."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - הדפסת קבוצת התג: קבוצה.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - select all media.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - שימוש ברשימת המקורות המופרדים ע\"י פסיק בלבד\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"unknown options '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "unable to create transaction"
-msgstr "בלתי אפשרי לעשות עסקה"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "אין מה להסיר (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"שום כניסה המיועדת להסרה אינה חסרה\n"
+"(אחד מ %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
+"שימוש: urpmi.update [options] <name> ...\n"
+"כאשר <name> הינו שם המדיה המיודעת לעדכון.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "distributing %s"
-msgstr "מפיץ %s"
-
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "ההתקנה נכשלה"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - update only update media.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "כתיבת קובץ הגדרות [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - בחירת כל המדיות שאינן ניתנות להסרה.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - הדפסת תקופת התג: תקופה.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"לא חסרה שום כניסה המיועדת לעדכון\n"
+"(אחד מ %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"גרסת urpmf %s\n"
+"כל הזכויות שמורות (C) 2002 MandrakeSoft.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
+"\n"
+"\n"
+"שימוש:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "נא להכניס את המדיה הנקראת \"%s\"  להתקן [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - list available packages.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - הגדרת מאגר עדכון.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - list available media.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - הצגת מאגרי עדכון זמינים ואת כתובתם.\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impose fuzzy search (same as --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "Ok"
-msgstr "אישור"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr ""
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - list available nodes when using --parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "מסיר %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list available parallel aliases.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - יוצר אוטומטית מאגר עבור חלק XXX של\n"
-"                   הפצה, XXX יכול להיות ראשי, תרומה, עדכון או\n"
-"                   כל דבר אחר שהוגדר ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - הדפסת גודל התג: גודל.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "בכדי לשמור %s"
+"  --headers      - תמצית כותרות עבור חבילות רשומות עבור urpmi db to\n"
+"                   stdout (רק מנהל מערכת).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "עקב תלות %s שלא מולאה"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      -נותן כל חבילות המקור לפני הורדה (רק מנהל מערכת).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"התקנה אוטומטית של החבילות ... \n"
-"ביקשת התקנה של החבילות %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "בסיס הנתונים של urpmi נעול"
+msgid "  --changelog    - print changelog.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - הסרת חבילה אם גרסה מאוחרת יותר כבר מותקנת.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "לוקח התקן נייד כ - \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - הסרת חבילה אם גרסה מאוחרת יותר כבר מותקנת.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - print version and release with name also.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "עקב %s חסר"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  שמות או קובצי RPM שניתנו בשורת הפקודה נמצאים בסימן שאלה.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"שימוש: urpmi.update [options] <name> ...\n"
-"כאשר <name> הינו שם המדיה המיודעת לעדכון.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "מנסה לדלג על המקור הנוכחי \"%s\", מתחמק"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - וידוי שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "אחת החבילות הבאות נדרשת להתקנת %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "גרסת urpmq %s\n"
+#~ "כל הזכויות שמורות (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "זוהי תוכנה חופשית הניתנת להפצה על-פי תנאי רישיון ה GNU GPL\n"
+#~ "\n"
+#~ "שימוש:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "webfetch לא ידוע `%s' !!!\n"
diff --git a/po/hi.po b/po/hi.po
index 19a5ba0f..9a444202 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-10 21:44+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी (Hindi) <dysxhi@yahoo.co.in>\n"
@@ -37,1978 +37,2022 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s का संसाधन किया जा रहा है\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - एक संसाधन माध्यम से सभी मीडीया का स्वतः \n"
-"                   निर्माण करें\n"
+"पैकेजों का स्वचालित संसाधन...\n"
+"आपने %s पैकेजों के संसाधन का आग्रह किया है\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
+msgid "Is this OK?"
+msgstr "क्या यह ठीक है?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
+msgid "Ok"
+msgstr "ओ०के०"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s को संसाधित करने के लिए, निम्नलिखित पैकेजों में से एक की आवश्यकता है: "
+msgid "Cancel"
+msgstr "निरस्त"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s पैकेज को हटाया जा रहा है"
+msgid " (Y/n) "
+msgstr "(हाँ/ना:Y/n)"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: निर्देश नहीं मिला\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "use-distrib विधा के साथ सामान्तर विधा का उपयोग नहीं किया जा सकता है"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"उपयोगिता: %s [विकल्प]\n"
+"जहाँ सभी [विकल्प] से है\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - शीर्ष कैच निर्देशिका को स्वच्छ करें\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - परिणामों को दिये हुए समूह तक सीमित करना\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "%d पद्धति का उपयोग कार्य संपादन के लिए हो रहा है"
+msgid "                    defaults is %s.\n"
+msgstr "                    %s डिफ़ाल्ट है ।\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
+msgid "unknown protocol defined for %s"
+msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "आपकी क्या इच्छा है?  (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है:  %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "कैच में %d शीर्षक मिलें"
+msgid "unable to handle protocol: %s"
+msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "यहाँ बहुत सारे पैकेज \"%s\" संचिका के समान नाम वाले है"
+msgid "syntax error in config file at line %s"
+msgstr "संरचना संचिका के वाक्य संख्या %s पर वाक्य-रचना त्रुटि"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - प्रोक्सी प्रमाणीकरण के लिए उपयोगकर्ता और कूटशब्द बतायें\n"
-"                    (निर्देश देने का तरीका <उपयोगकर्ता:कूटशब्द>).\n"
+"\"%s\" माध्यम, एक पहिले से उपयोग की जा रही हार्डडिस्क सूची को उपयोग करने की चेष्टा कर "
+"रहा है, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "आधीनताओं की गणना का द्वितीय चरण पूरा किया जा रहा है\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" माध्यम, एक पहिले से उपयोग की जा रही सूची को उपयोग करने की चेष्टा कर रहा है, "
+"माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"\"%s\" माध्यम को सँभालने में असमर्थ क्योंकि संचिका-सूची पहिले से अन्य माध्यम के द्वारा उपयोग "
+"कीजा रही है "
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - उपलब्ध समान्तर नामों को दिखायें\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"बेनाम माध्यम के लिए \"%s\" नाम उपयोग करने में असमर्थ क्योंकि यह पहिले से उपयोग किया जा "
+"रहा है"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"\"%s\" माध्यम को गिनती में लेने में असमर्थ क्योंकि कोई संचिका-सूची [%s] नहीं विद्यमान है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" के लिए संचिका-सूची का निरीक्षण करने में असमर्थ,  माध्यम स्वीकार नहीं है"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "इस हार्डडिस्क संचिका-सूची [%s] के माध्यम का निर्धारण करने असमर्थ"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर), सत्य यदि एक अभिव्यक्ति सत्य "
-"है\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" की हार्डडिस्क संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "पैकेज संसाधित हो रहा है..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" की संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "विद्यमान माध्यम \"%s\" से अलग हट कर निकलने की चेष्टा, बच निकला जा रहा है"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"काल्पनिक माध्यम \"%s\" को हार्डडिस्क सूची या सूची संचिका को परिभाषित नहीं करना चाहिए,"
+"माध्यम स्वीकार नहीं है"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"काल्पनिक माध्यम \"%s\" के पास एक स्पष्ट यू०आर०एल० होना चाहिए, माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ(कोई मैनड्रैक/मूल/हार्डडिस्क संचिका नहीं मिली)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" के लिए हार्डडिस्क संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" के लिए संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" के लिए बेमेल संचिका-सूची, माध्यम स्वीकार नहीं है"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - टैग सारांश को मुद्रित करें: सारांश\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" के लिए संचिका-सूची का निरीक्षण करने में असमर्थ,  माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "हटाने-योग्य माध्यम \"%s\" के लिए बहुत सारे आरोह बिंदु"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "इसे संसाधित करें"
+msgid "taking removable device as \"%s\""
+msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "विभिन्न हटाने-योग्य साधनों [%s] का उपयोग \"%s\" के लिए हो रहा है"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "हटाने-योग्य माध्यम \"%s\" के लिए पथ-नाम को पुनः प्राप्त करने में असमर्थ"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों को संसाधित किया जाने वाला है (%d "
-"एम०बी०)"
+msgid "unable to write config file [%s]"
+msgstr "संरचना-संचिका [%s] को लिखने में असमर्थ"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - वातावरण के अनुसार, श्रेष्ठ इन्टरफ़ेस का चयन करें:\n"
-"                   एक्स (X) या गद्य (text) विधि\n"
+msgid "write config file [%s]"
+msgstr "संरचना-संचिका [%s] लिखें"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "use-distrib विधा के साथ सामान्तर विधा का उपयोग नहीं किया जा सकता है"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब  --install-src निर्देश "
-"का उपयोग किया जा रहा हो"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "समान्तर प्रबंधकर्ता का निरीक्षण [%s] संचिका में हो रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "%s नाम का कोई पैकेज नहीं है"
+msgid "found parallel handler for nodes: %s"
+msgstr "नोडों: %s के लिए समान्तर प्रबंधकर्ता मिला है"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "समान्तर मोड: %s के लिए संयुक्त माध्यम का उपयोग हो रहा है"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"संसाधन असफ़ल, कुछ संचिकाऐं नहीं मिली है:\n"
-"%s\n"
-"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
+msgid "unable to use parallel option \"%s\""
+msgstr "समान्तर विकल्प \"%s\" का उपयोग करने में असमर्थ"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"उपयोग विधि: urpmi.removemedia [-a] <नाम> ...\n"
-"जहाँ <नाम> एक माध्यम का नाम है जिसे हटाना है\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "--कृत्रिमता का उपयोग --माध्यम, --अपडेट या --समान्तर के साथ नहीं हो सकता है"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"संसाधन जारी नहीं रक्खा जा सकता है क्योंकि अन्य पैकेजों को उन्न्त बनाने के लिए\n"
-"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "नेटवर्क माध्यम `के साथ' विलुप्त\n"
+msgid "examining hdlist file [%s]"
+msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --l         - पैकेज में स्थित संचिकाओं की सूची।\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "काल्पनिक माध्यम \"%s\" स्थानीय नहीं है, माध्यम स्वीकार नहीं है"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "अज्ञात पैकेज"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "\"%s\" माध्यम की हार्डडिस्क सूची संचिका या कृत्रिम संचिका को पढ़ने में सामस्या"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "संसाधन संभव है"
+msgid "performing second pass to compute dependencies\n"
+msgstr "आधीनताओं की गणना का द्वितीय चरण पूरा किया जा रहा है\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "%s पैकेज को त्यागा जा रहा है"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है (%d एमबी)"
+msgid "would install instead of upgrade package %s"
+msgstr "%s को उन्नयन करने की बजाय संसाधित किया जायेगा"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"\"%s\" माध्यम को गिनती में लेने में असमर्थ क्योंकि कोई संचिका-सूची [%s] नहीं विद्यमान है"
+msgid "unable to open rpmdb"
+msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr "(हाँ/ना:y/N)"
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" माध्यम पहिले से विद्यमान है"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "एक कुकर वितरण के उन्नयनों (अपडेट्स) को जोड़ा नहीं जा सकता है\n"
+msgid "virtual medium need to be local"
+msgstr "काल्पनिक माध्यम को स्थानीय होना चाहिए"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
+msgid "added medium %s"
+msgstr "%s माध्यम को जोड़ा गया"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "प्रारंभिकीकरण..."
+msgid "unable to access first installation medium"
+msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - उपलब्ध पैकेजों को दिखायें\n"
+msgid "copying hdlists file..."
+msgstr "हार्डडिस्क सूची संचिका की प्रतिलिपि बनाई जा रही है..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - सभी टैगों को मुद्रित करें\n"
+msgid "...copying failed"
+msgstr "...प्रतिलिपि बनना असफ़ल"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
+msgid "...copying done"
+msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"काल्पनिक माध्यम \"%s\" को हार्डडिस्क सूची या सूची संचिका को परिभाषित नहीं करना चाहिए,"
-"माध्यम स्वीकार नहीं है"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ(कोई मैनड्रैक/मूल/हार्डडिस्क संचिका नहीं मिली)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों की एम०डी०५सम (md5sum) की "
-"गणना की जा रही है"
+msgid "retrieving hdlists file..."
+msgstr "हार्डडिस्क सूची संचिका को पुनःप्राप्त किया जा रहा है..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - पथ को अलग करें, छोटे विराम चिह्न के द्वारा अलग किये हुए\n"
+msgid "...retrieving done"
+msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
+msgid "...retrieving failed: %s"
+msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"अज्ञात विकल्प '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "हार्डडिस्क सूची संचिका में अवैध हार्डडिस्क सूची विवरण \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - छोटे क्रिया-कलापों में विभाजित करें यदि दिए गए पैकेजों से ज्यादा \n"
-"को संसाधित या उन्नयत किया जाना है,\n"
-"                   सामान्य संख्या %d है।\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "\"%s\" माध्यम की हार्डडिस्क सूची संचिका या कृत्रिम संचिका को पढ़ने में सामस्या"
+msgid "selecting multiple media: %s"
+msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - डबलू०गेट का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "\"%s\" माध्यम को हटाया जा रहा है"
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
+"\"%s\" माध्यम की पहुँच में असमर्थ,\n"
+"यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया हो।"
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes   - उपलब्ध नोडस को दिखायें, जब --parallel विकल्प का उपयोग किया जा "
-"रहा हो\n"
+"काल्पनिक माध्यम \"%s\" के पास हार्डडिस्क सूची या कृत्रिमता का वैध स्रोत्र होना "
+"चाहिए।माध्यम स्वीकार नहीं है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "हार्डडिस्क-सूची [%s] का निर्माण किया जा रहा है"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  --keep         - यदि सम्भव हो तो विद्यमान पैकेजों को रक्खे, निवेदित पैकेजों को "
-"अस्वीकार करें,\n"
-"                   जिनके कारण से हटाना पड़ रहा है।\n"
+"विद्यमान हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों के एम०डी०५सम (md5sum) की "
+"गणना की जा रही है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "एम०डी०५सम (md5sum) संचिका का निरीक्षण किया जा रहा है"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: निर्देश नहीं मिला\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" की मूल (या कॄत्रिम) हार्डडिस्क सूची की प्रतिलिपि बनाई जा रही है..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
-"  --allow-nodeps - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं की जाँच करें,\n"
-"                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
+"स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों की एम०डी०५सम (md5sum) की "
+"गणना की जा रही है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "प्रोटोकॉल: %s को काबू करने में असमर्थ"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "हार्डडिस्क सूची संचिका को पुनःप्राप्त किया जा रहा है..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "हाँ, वास्तव इसे संसाधित करें"
+msgid "reading rpm files from [%s]"
+msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "%s माध्यम को जोड़ा गया"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "आर०पी०एम० संचिकाओं को [%s] से पढ़ने में असमर्थ: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ना उपयोग में आने वाले आर०पी०एम० को कैच में रक्खें\n"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] कि लिए कोई आर०पी०एम० संचिकाऐं नहीं मिली"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
+
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
-"उन्नयन=%d)"
+"पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
+"गणना की जा रही है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "एम०डी०५सम (md5sum) बेमेल"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "संरचना संचिका के वाक्य संख्या %s पर वाक्य-रचना त्रुटि"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) का पुनः प्राप्त करना असफ़ल"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - बतायी गयी एच०टी०टी०पी० प्रोक्सी का उपयोग करें, पोर्ट संख्या की "
-"डिफ़ॉल्ट कल्पना १०८० के रूप में\n"
-"                   कर ली गई है (निर्देश देने का तरीका <प्रोक्सी होस्ट[:पोर्ट]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "[%s] संचिका \"%s\" समान माध्यम में पहिले से उपयोग में है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "%s को संसाधित के लिए"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" की हार्डडिस्क संचिका का पदभंजन करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "डेप्स-सूची में %s प्रविष्टियां पुनः स्थापित  की गई"
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" के लिए संचिका-सूची में कुछ भी नहीं लिखा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s को उन्नयन करने की बजाय संसाधित किया जायेगा"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "समरूप प्रणालियों को %s पर पुनः प्राप्त किया जा रहा है ..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "अज्ञात प्रोटोकॉल %s के लिए परिभाषित"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - संस्मरण और विमोचन संख्या को नाम के साथ मुद्रित करें\n"
+msgid "building hdlist [%s]"
+msgstr "हार्डडिस्क-सूची [%s] का निर्माण किया जा रहा है"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" माध्यम पहिले से विद्यमान है"
+msgid "found %d headers in cache"
+msgstr "कैच में %d शीर्षक मिलें"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "%s का संसाधन किया जा रहा है\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "कैच में स्थित %d अप्रचलित शीर्षकों को हटाया जा रहा है"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
-"(%s में से एक)\n"
+msgid "mounting %s"
+msgstr "%s को आरोह (माउन्ट) किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
+msgid "unmounting %s"
+msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "%s पैकेज को ह्टाने में असमर्थ"
+msgid "relocated %s entries in depslist"
+msgstr "डेप्स-सूची में %s प्रविष्टियां पुनः स्थापित  की गई"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
+msgid "no entries relocated in depslist"
+msgstr "डेप्स-सूची में कोई प्रविष्टियां पुनः स्थापित नहीं है"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"हटायी जाने वाली प्रविष्टि लुप्त है\n"
-"(%s में से एक)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - सभी माध्यमों का चयन करें\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "आर०पी०एम० संचिका [%s] को पुनः प्राप्त किया जा रहा है..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "विलुप्त हस्ताक्षर (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "आर०पी०एम० संचिकाओं को [%s] से पढ़ने में असमर्थ: %s"
+msgid "unable to register rpm file"
+msgstr "आर०पी०एम० संचिका का पंजीकरण में असमर्थ"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
+msgid "error registering local packages"
+msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
+msgid "no package named %s"
+msgstr "%s नाम का कोई पैकेज नहीं है"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
+msgid "The following packages contain %s: %s"
+msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr "(हाँ/ना:Y/n)"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "यहाँ बहुत सारे पैकेज \"%s\" संचिका के समान नाम वाले है"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - परिणामों को दिये हुए समूह तक सीमित करना\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "भली-भांति से [%s] का पदभंजन \"%s\" मान पर करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"\"%s\" माध्यम, एक पहिले से उपयोग की जा रही सूची को उपयोग करने की चेष्टा कर रहा है, "
-"माध्यम स्वीकार नहीं है"
+"\"%s\" माध्यम एक अवैध संचिका सूची का उपयोग कर रहा है\n"
+"दर्पण-स्थल (समरूप प्रणाली) लगता है कि अप-टु-डेट नहीं है। अन्य तरीके को उपयोग करने की "
+"चेष्टा करें"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "भ्रष्ट इन्पुट:  [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "\"%s\" माध्यम, आर०पी०एम० संचिकाओं के लिए किसी स्थान को परिभाषित नहीं करता है"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
+msgid "package %s is not found."
+msgstr "%s पैकेज नहीं मिला"
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
+msgid "urpmi database locked"
+msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "\"%s\" माध्यम से आर०पी०एम० संचिका [%s] को पढ़ने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "डेप्स-सूची में कोई प्रविष्टियां पुनः स्थापित नहीं है"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - सिर्फ़ स्रोत्र पैकेज को संसाधित करें (कोई बॉयनरी नहीं)\n"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" माध्यम को पाने में असमर्थ"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
+msgid "malformed input: [%s]"
+msgstr "भ्रष्ट इन्पुट:  [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "क्या आप सहमत है ?"
+msgid "Preparing..."
+msgstr "तैयारी की जा रही है..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" के लिए बेमेल संचिका-सूची, माध्यम स्वीकार नहीं है"
+msgid "using process %d for executing transaction"
+msgstr "%d पद्धति का उपयोग कार्य संपादन के लिए हो रहा है"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"%s पर संसाधन करने के लिए कार्य-संपादन का निर्माण किया गया (हटाना=%d, संसाधन=%d, "
+"उन्नयन=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s पैकेज को जोड़ा जा रहा है (आई०डी०=%d, ई०आई०डी०=%d, उन्नयन=%d, संचिका=%s)"
+msgid "unable to create transaction"
+msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "%s पैकेज को त्यागा जा रहा है"
+msgid "removing package %s"
+msgstr "%s पैकेज को हटाया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "अवैध हस्ताक्षर (%s)"
+msgid "unable to remove package %s"
+msgstr "%s पैकेज को ह्टाने में असमर्थ"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  निर्देश वाक्य पर दिये हुए नामों या आर०पी०एम० संचिकाओं की जाँच की गई है\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s पैकेज को जोड़ा जा रहा है (आई०डी०=%d, ई०आई०डी०=%d, उन्नयन=%d, संचिका=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"यू०आर०पी०एम०आई० संस्मरण %s॥ सर्वाधिकार © १९९९, २०००, २००१, २००२ मैनड्रैकसॉफ़्ट ॥यह एक "
-"मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकारपत्र के अन्तर्गत पुनः वितरित किया जा "
-"सकता है।\n"
-"\n"
-"उपयोग विधि:\n"
+msgid "unable to install package %s"
+msgstr "%s पैकेज को संसाधन करने में असमर्थ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "भली-भांति से [%s] का पदभंजन \"%s\" मान पर करने में असमर्थ"
+msgid "due to missing %s"
+msgstr "%s के ना मिलने के कारण"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
-"किये हुए\n"
+msgid "due to unsatisfied %s"
+msgstr "असन्तुष्ट %s के कारण"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "इस हार्डडिस्क संचिका-सूची [%s] के माध्यम का निर्धारण करने असमर्थ"
+msgid "trying to promote %s"
+msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" की हार्डडिस्क संचिका का पदभंजन करने में असमर्थ"
+msgid "in order to keep %s"
+msgstr "%s को रखने के लिए"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"\"%s\" माध्यम, एक पहिले से उपयोग की जा रही हार्डडिस्क सूची को उपयोग करने की चेष्टा कर "
-"रहा है, माध्यम स्वीकार नहीं है"
+msgid "in order to install %s"
+msgstr "%s को संसाधित के लिए"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s के साथ विरोधाभास के कारण"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "कैच में स्थित %d अप्रचलित शीर्षकों को हटाया जा रहा है"
+msgid "unrequested"
+msgstr "बिना निवेदन किया हुआ"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "\"%s\" माध्यम को अपडेट करने में असमर्थ\n"
+msgid "Invalid signature (%s)"
+msgstr "अवैध हस्ताक्षर (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये?  (हाँ/ना)(y/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "अवैध कुंजी आई०डी० (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "काल्पनिक माध्यम \"%s\" स्थानीय नहीं है, माध्यम स्वीकार नहीं है"
+msgid "Missing signature (%s)"
+msgstr "विलुप्त हस्ताक्षर (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "तैयारी की जा रही है..."
+msgid "bad proxy declaration on command line\n"
+msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    %s डिफ़ाल्ट है ।\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "विभिन्न हटाने-योग्य साधनों [%s] का उपयोग \"%s\" के लिए हो रहा है"
+msgid "Sorry, bad choice, try again\n"
+msgstr "क्षमा करें, खराब पसन्द, पुनः प्रयास करें\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     - किसी कृत्रिम या हार्डडिस्क सूची संचिका को खोजने का \n"
-"                   प्रयास ना करें\n"
+"यू०आर०पी०एम०ई० संस्मरण %s\n"
+"सर्वाधिकार © १९९९, २०००, २००१, २००२ मैनड्रैकसॉफ़्ट\n"
+"यह मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित किया "
+"जा सकता है\n"
+"\n"
+"उपयोग विधि:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - एक वितरित वृक्ष के लिए यूआरपीएमआई की देखते-देखते संरचना।\n"
-"                   यह एक वितरण की पूछ-ताछ करने की अनुमति देता है।\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"उपयोगिता: %s [विकल्प]\n"
-"जहाँ सभी [विकल्प] से है\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - कुछ भी करने कि पहिले आर०पी०एम० को कैच से हटायें\n"
+"  --force        - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
+"करें \n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"बेनाम माध्यम के लिए \"%s\" नाम उपयोग करने में असमर्थ क्योंकि यह पहिले से उपयोग किया जा "
-"रहा है"
+"  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"काल्पनिक माध्यम \"%s\" के पास हार्डडिस्क सूची या कृत्रिमता का वैध स्रोत्र होना "
-"चाहिए।माध्यम स्वीकार नहीं है"
+"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
+"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
+"उपयोगी।\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"यू०आर०पी०एम०ई० संस्मरण %s\n"
-"सर्वाधिकार © १९९९, २०००, २००१, २००२ मैनड्रैकसॉफ़्ट\n"
-"यह मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित किया "
-"जा सकता है\n"
-"\n"
-"उपयोग विधि:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"उपयोग विधि: urpmi.addmedia [विकल्प] <नाम> <यू०आर०एल०> [<सापेक्ष_पथ> के साथ]\n"
-"जहां <यू०आर०एल०l> निम्न में से एक है\n"
-"       file://<पथ>\n"
-"       ftp://<संत्रआरम्भ>:<कूटशब्द>@<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> "
-"के साथ\n"
-"       ftp://<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> के साथ\n"
-"       http://<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> के साथ\n"
-"       removable://<पथ>\n"
-"\n"
-"और [विकल्प] से है\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" की मूल (या कॄत्रिम) हार्डडिस्क सूची की प्रतिलिपि बनाई जा रही है..."
+msgid "unknown packages"
+msgstr "पैकेजों का प्रकार अज्ञात"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
+msgid "unknown package"
+msgstr "अज्ञात पैकेज"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "समान्तर विकल्प \"%s\" का उपयोग करने में असमर्थ"
+msgid "removing package %s will break your system"
+msgstr "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"\"%s\" माध्यम एक अवैध संचिका सूची का उपयोग कर रहा है\n"
-"दर्पण-स्थल (समरूप प्रणाली) लगता है कि अप-टु-डेट नहीं है। अन्य तरीके को उपयोग करने की "
-"चेष्टा करें"
+msgid "Nothing to remove"
+msgstr "हटाने को कुछ भी नहीं"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ"
+msgid "Checking to remove the following packages"
+msgstr "निम्नलिखित पैकेजों को हटाने जाने के लिए जाँच हो रही है"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "काल्पनिक माध्यम को स्थानीय होना चाहिए"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों को संसाधित किया जाने वाला है (%d "
+"एम०बी०)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "स्थानीय पैकेजों का पंजीकरण करने में त्रुटि"
+msgid " (y/N) "
+msgstr "(हाँ/ना:y/N)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - डॉउनलोड के वेग को सीमित करें\n"
+msgid "removing %s"
+msgstr "%s को हटाया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
+msgid "Removing failed"
+msgstr "हटाना असफ़ल"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) का पुनः प्राप्त करना असफ़ल"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"यू०आर०पी०एम०एफ़० संस्मरण %s॥ सर्वाधिकार © २००२ मैनड्रैकसॉफ़्ट ॥यह एक मुक्त सॉफ़्टवेयर है और "
+"जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित किया जा सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] कि लिए कोई आर०पी०एम० संचिकाऐं नहीं मिली"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" के लिए संचिका-सूची में कुछ भी नहीं लिखा है"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
+"किये हुए\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
+"किये हुए\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"विद्यमान हार्डडिस्क सूची (या कृत्रिम रचनाओं) की प्रतिलिपियों के एम०डी०५सम (md5sum) की "
-"गणना की जा रही है"
+"  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
+"में लगाना\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - सम्पूर्ण आउटपुट को पैकेज के साथ हटायें\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - कृत्रिमता का उपयोग यू०आर०पी०एम०आई०-डी०बी० के बजाय\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s पैकेज को संसाधन करने में असमर्थ"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
-"                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "संचिका को सुरक्षित करें"
+"  --quiet        - टैग का नाम मुद्रित ना करें (सामान्यता, यदि कोई टैग निर्देश वाक्य के "
+"साथ  ना दिया हो,\n"
+"                   परस्पर संपर्क (इन्टर-ऐक्टिव) मोड के साथ अयोग्य)\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "संरचना-संचिका [%s] को लिखने में असमर्थ"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - सभी टैगों को मुद्रित करें\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "अवैध कुंजी आई०डी० (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
-"करें \n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "हटाने-योग्य माध्यम \"%s\" के लिए पथ-नाम को पुनः प्राप्त करने में असमर्थ"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - टैग सारांश को मुद्रित करें: सारांश\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "निम्नलिखित पैकेजों को हटाने जाने के लिए जाँच हो रही है"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "बिना निवेदन किया हुआ"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "आर०पी०एम० संचिका [%s] को पाने में असमर्थ"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - टैग की संचिकाऐं मुद्रित करें: सभी संचिकाऐं \n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमर्थ"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "\"%s\" माध्यम से आर०पी०एम० संचिका [%s] को पढ़ने में असमर्थ"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
-"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
-"उपयोगी।\n"
+"  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष\n"
+"                   रिपोर्ट)\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - उपयोगी सूचनाओं का पठनीय रूप में मुद्रण\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - निर्दिष्ट किया हुए वितरण का संस्मरण का उपयोग करें, डिफ़ॉल्ट को, \n"
-"                   मैनड्रैक विमोचित पैकेज के द्वारा बताये गये वितरण के संस्मरण\n"
-"                   जैसा ले लिया गया है\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - समकक्ष प्रणालियों की सूची के लिए,  निर्दिष्ट यू०आर०एल० का उपयोग "
-"करें, डिफ़ॉल्ट\n"
-"                   %s है\n"
+"  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर), सत्य यदि दोनों अभिव्यक्तियां "
+"सत्य है\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
-"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
-"उपयोगी।\n"
+"  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर), सत्य यदि एक अभिव्यक्ति सत्य "
+"है\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - एकल \"नहीं\", सत्य यदि अभिव्यक्ति असत्य है\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - बाँया कोष्टक का चिह्न समूह अभिव्यक्ति का खोलने के लिए\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
-"करेंया इसे हटा दें ।"
+"यथास्थिति करने का निर्देश (कॉलबैक) %s\n"
+"है\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
+msgid "using specific environment on %s\n"
+msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
-"करें)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% समाप्त, वेग = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"यू०आर०पी०एम०आई० संस्मरण %s॥ सर्वाधिकार © १९९९, २०००, २००१, २००२ मैनड्रैकसॉफ़्ट ॥यह एक "
+"मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकारपत्र के अन्तर्गत पुनः वितरित किया जा "
+"सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)?  (हाँ/ना)(y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...प्रतिलिपि बनना असफ़ल"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - यदि सम्भव हो तो विद्यमान पैकेजों को रक्खे, निवेदित पैकेजों को "
+"अस्वीकार करें,\n"
+"                   जिनके कारण से हटाना पड़ रहा है।\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" की हार्डडिस्क संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - छोटे क्रिया-कलापों में विभाजित करें यदि दिए गए पैकेजों से ज्यादा \n"
+"को संसाधित या उन्नयत किया जाना है,\n"
+"                   सामान्य संख्या %d है।\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - शांत विधि\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - लघु क्रिया-कलाप लंबाई, सामान्य संख्या %d है।\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - सभी स्रोत्र पैकेजों को डॉउनलोड के पहिले दें (सिर्फ़ महाउपयोगकर्ता)\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - शीर्षकों को, यू०आर०पी०एम०आई० डी०बी० में सूचीबद्व पैकेज के लिए "
-"एसटीडीआउट पर निकालें\n"
-"                    (सिर्फ़ महाउपयोगकर्ता)\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - सिर्फ़ स्रोत्र पैकेज को संसाधित करें (कोई बॉयनरी नहीं)\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "पैकेजों का प्रकार अज्ञात"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - कुछ भी करने कि पहिले आर०पी०एम० को कैच से हटायें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ना उपयोग में आने वाले आर०पी०एम० को कैच में रक्खें\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं की जाँच करें,\n"
+"                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "[%s] संचिका \"%s\" समान माध्यम में पहिले से उपयोग में है"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
+"                   संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"हटाने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए करें)\n"
+"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
+"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
+"उपयोगी।\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" के लिए संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - डबलू०गेट का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - यह सहायता संदेश मुद्रित करें\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - कर्ल का उपयोग दूर स्थित संचिकाओं को प्राप्त करने के लिए करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "नोडों: %s के लिए समान्तर प्रबंधकर्ता मिला है"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - डॉउनलोड के वेग को सीमित करें\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"यथास्थिति करने का निर्देश (कॉलबैक) %s\n"
-"है\n"
+"  --resume   - अधूरी-डॉउनलोड-की-हुई संचिकाओं के स्थानान्तरण का पुनः आरम्भ\n"
+"                   (--no-resume इसे असक्रिय करता है, डिफ़ॉल्ट असक्रिय है)।\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - पैकेजों की जो आवश्यक है उससे विपरीत खोज करें\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - बतायी गयी एच०टी०टी०पी० प्रोक्सी का उपयोग करें, पोर्ट संख्या की "
+"डिफ़ॉल्ट कल्पना १०८० के रूप में\n"
+"                   कर ली गई है (निर्देश देने का तरीका <प्रोक्सी होस्ट[:पोर्ट]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"यू०आर०पी०एम०एफ़० संस्मरण %s॥ सर्वाधिकार © २००२ मैनड्रैकसॉफ़्ट ॥यह एक मुक्त सॉफ़्टवेयर है और "
-"जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित किया जा सकता है।\n"
-"\n"
-"उपयोग विधि:\n"
+"  --proxy-user   - प्रोक्सी प्रमाणीकरण के लिए उपयोगकर्ता और कूटशब्द बतायें\n"
+"                    (निर्देश देने का तरीका <उपयोगकर्ता:कूटशब्द>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - टैग का नाम मुद्रित ना करें (सामान्यता, यदि कोई टैग निर्देश वाक्य के "
-"साथ  ना दिया हो,\n"
-"                   परस्पर संपर्क (इन्टर-ऐक्टिव) मोड के साथ अयोग्य)\n"
+"  --bug          - एक दोष रिपोर्ट को अगले मान के द्वारा बताई गयी निर्देशिका में\n"
+"                   निर्गम करें\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "--कृत्रिमता का उपयोग --माध्यम, --अपडेट या --समान्तर के साथ नहीं हो सकता है"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - वातावरण के अनुसार, श्रेष्ठ इन्टरफ़ेस का चयन करें:\n"
+"                   एक्स (X) या गद्य (text) विधि\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - निर्दिष्ट किया हुए शिल्प का उपयोग करें, डिफ़ॉल्ट मैनड्रैक विमोचित "
-"पैकेजों को \n"
-"                   संसाधित कर दिया गया है\n"
+"  --verify-rpm   - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
+"                   (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "क्या यह ठीक है?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - पथ को अलग करें, छोटे विराम चिह्न के द्वारा अलग किये हुए\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - प्रलेखन संचिकाओं को अलग करके।\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - कृत्रिमता का उपयोग यू०आर०पी०एम०आई०-डी०बी० के बजाय\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - निर्देश वाक्य पर सभी मिलानों को चयन करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "समान्तर प्रबंधकर्ता का निरीक्षण [%s] संचिका में हो रहा है"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए खोज की अनुमति प्रदान करें\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "हटाने को कुछ भी नहीं"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - पूर्वनिर्दिष्टों में पैकेज को पाने के लिए ना खोजे\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - अस्पष्ट खोज को लागू करें (--fuzzy जैसा)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - अगला पैकेज एक स्रोत्र पैकेज है (--src जैसा)\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - जाँच को पैकेज की अधिनताओं तक ले जायें\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - शांत विधि\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "निर्देश वाक्य पर दिये हुए नाम या आर०पी०एम० संचिकाऐं संसाधित की जायेगी\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
+
+#: ../urpmi:197
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --bug          - एक दोष रिपोर्ट को अगले मान के द्वारा बताई गयी निर्देशिका में\n"
-"                   निर्गम करें\n"
+"द्विआधारी आर०पी०एम० संचिकाओं के साथ क्या किया जा सकता है, जब  --install-src निर्देश "
+"का उपयोग किया जा रहा हो"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "\"%s\" माध्यम, आर०पी०एम० संचिकाओं के लिए किसी स्थान को परिभाषित नहीं करता है"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"आपने एक स्रोत पैकेज का चयन किया है:\n"
+"\n"
+"%s\n"
+"\n"
+"सम्भवता आप इसे अपने कम्प्यूटर पर संसाधित नहीं करना चाहते है (इसे संसाधित करने से,\n"
+"आपको इसके मूल-कूट में परिवर्तन करने की और इसे संकलन करने की अनुमति मिल जायेगी)।\n"
+"\n"
+"आप क्या करना चाहते है?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
+msgid "Do nothing"
+msgstr "कुछ नहीं करो"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" की सूची संचिका को लिखने में असमर्थ"
+msgid "Yes, really install it"
+msgstr "हाँ, वास्तव इसे संसाधित करें"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
+msgid "Save file"
+msgstr "संचिका को सुरक्षित करें"
 
-#: ../urpm.pm:1
+#: ../urpmi:225
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"आप अपने कम्प्यूटर पर निम्नलिखित सॉफ़्टवेयर पैकेज को अब संसाधित ही करने जा रहे है:\n"
+"\n"
+"%s\n"
+"\n"
+"आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
+msgid "Install it"
+msgstr "इसे संसाधित करें"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "प्रतिलिपि बनना असफ़ल"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"[%s] निर्देशिका पहिले से विद्यमान है, कृपया दोष रिपोर्ट के लिए अन्य निर्देशिका का उपयोग "
+"करेंया इसे हटा दें ।"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "दोष रिपोर्ट के लिए, [%s] निर्देशिका का निर्माण करने में असमर्थ"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
+msgid "Copying failed"
+msgstr "प्रतिलिपि बनना असफ़ल"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
+msgid "Only superuser is allowed to install packages"
+msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - अगला पैकेज एक स्रोत्र पैकेज है (--src जैसा)\n"
+msgid "One of the following packages is needed:"
+msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "%s का संसाधन किया जा रहा है"
+msgid "What is your choice? (1-%d) "
+msgstr "आपकी क्या इच्छा है?  (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s] से आर०पी०एम० संचिकाओं को पढ़ा जा रहा है"
+msgid "Package installation..."
+msgstr "पैकेज संसाधित हो रहा है..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
+msgid "Initializing..."
+msgstr "प्रारंभिकीकरण..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"निवेदन किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "हटाना असफ़ल"
+msgid "do you agree ?"
+msgstr "क्या आप सहमत है ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - काल्पनिक माध्यम का निर्माण करना जो हमेशा अप-टु-डेट रहें,\n"
-"                   सिर्फ़  file:// प्रोटोकॉल की अनूमति है।\n"
+"संसाधन जारी नहीं रक्खा जा सकता है क्योंकि अन्य पैकेजों को उन्न्त बनाने के लिए\n"
+"निम्नलिखित पैकेजों को हटाना पड़ेगा:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "%s पैकेज नहीं मिला"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" माध्यम को हटाया जा रहा है"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है (%d एमबी)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "निरस्त"
+msgid "unable to get source packages, aborting"
+msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - अगला पैकेज एक स्रोत्र पैकेज है (-s जैसा)\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष\n"
-"                   रिपोर्ट)\n"
+msgid "Press Enter when ready..."
+msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
-"में लगाना\n"
+msgid "Downloading package `%s'..."
+msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" माध्यम को पाने में असमर्थ"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s का %s%% समाप्त, अनुमानित समाप्ति का समय = %s, वेग = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "\"%s\" माध्यम का निर्माण करने में असमर्थ\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% समाप्त, वेग = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
+msgid "The following packages have bad signatures"
+msgstr "निम्नलिखित पैकेजों पर खराब हस्ताक्षार है"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - यूआरपीएमआई.एडमीडीया.आर्गूमेन्ट (urpmi.addmedia argument) के "
-"प्रारुप में संरचना को डम्प करना।\n"
+msgid "Do you want to continue installation ?"
+msgstr "क्या आप संसाधन जारी रखना चाहते है ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"निम्नलिखित आधिनताओं को संसाधित करने लिए, आपको महाउपयोगकर्ता होना चाहिए:\n"
+"संसाधन असफ़ल, कुछ संचिकाऐं नहीं मिली है:\n"
 "%s\n"
+"आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  -changelog      - परिवर्तन लॉग का मुद्रण\n"
+msgid "Installation failed"
+msgstr "संसाधन असफ़ल"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" की संचिका-सूची को पाने में असमर्थ, माध्यम स्वीकार नहीं है"
+msgid "distributing %s"
+msgstr "%s वितिरण किया जा रहा है"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
+msgid "installing %s"
+msgstr "%s का संसाधन किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "कोई वेबफ़ेच्च नहीं मिला, समर्थित वेबफ़ेच्च है:  %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "संसाधन का प्रयास बिना आधिनताओं की जाँच किये हुए किया जाये?  (हाँ/ना)(y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "हार्डडिस्क सूची संचिका की प्रतिलिपि बनाई जा रही है..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "संसाधन का प्रयास और जोर से (बलपूर्वक) किया जाये (--force)?  (हाँ/ना)(y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
+msgid "%d installation transactions failed"
+msgstr "%d संसाधन क्रिया-कलाप असफ़ल"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"काल्पनिक माध्यम \"%s\" के पास एक स्पष्ट यू०आर०एल० होना चाहिए, माध्यम स्वीकार नहीं है"
+msgid "Installation is possible"
+msgstr "संसाधन संभव है"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
+msgid "Everything already installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "कुछ नहीं करो"
+msgid "restarting urpmi"
+msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"उपयोग विधि: urpmi.addmedia [विकल्प] <नाम> <यू०आर०एल०> [<सापेक्ष_पथ> के साथ]\n"
+"जहां <यू०आर०एल०l> निम्न में से एक है\n"
+"       file://<पथ>\n"
+"       ftp://<संत्रआरम्भ>:<कूटशब्द>@<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> "
+"के साथ\n"
+"       ftp://<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> के साथ\n"
+"       http://<होस्ट>/<पथ> <हार्डडिस्क सूची की सापेक्ष संचिका नाम> के साथ\n"
+"       removable://<पथ>\n"
+"\n"
+"और [विकल्प] से है\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "समान्तर मोड: %s के लिए संयुक्त माध्यम का उपयोग हो रहा है"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s को आरोह (माउन्ट) किया जा रहा है"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"\"%s\" माध्यम को सँभालने में असमर्थ क्योंकि संचिका-सूची पहिले से अन्य माध्यम के द्वारा उपयोग "
-"कीजा रही है "
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - किसी कृत्रिम या हार्डडिस्क सूची संचिका को खोजने का \n"
+"                   प्रयास ना करें\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - एक संसाधन माध्यम से सभी मीडीया का स्वतः \n"
+"                   निर्माण करें\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s का %s%% समाप्त, अनुमानित समाप्ति का समय = %s, वेग = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - एक वितरण के एक्स एक्स एक्स भाग के लिए एक माध्यम का स्वतः निर्माण "
+"करें\n"
+"                    एक्स एक्स एक्स, मुख्य, अंशदान, अपडेट या\n"
+"                   कुछ भी और जिसे संरचित किया जा चुका है, होना चाहिए ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
-"गणना की जा रही है"
+"  --from         - समकक्ष प्रणालियों की सूची के लिए,  निर्दिष्ट यू०आर०एल० का उपयोग "
+"करें, डिफ़ॉल्ट\n"
+"                   %s है\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - निर्दिष्ट किया हुए वितरण का संस्मरण का उपयोग करें, डिफ़ॉल्ट को, \n"
+"                   मैनड्रैक विमोचित पैकेज के द्वारा बताये गये वितरण के संस्मरण\n"
+"                   जैसा ले लिया गया है\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - एक पैकेज को असंसाधित करने के लिए कभी ना पूछेना,संसाधन को रोकना\n"
+"  --arch         - निर्दिष्ट किया हुए शिल्प का उपयोग करें, डिफ़ॉल्ट मैनड्रैक विमोचित "
+"पैकेजों को \n"
+"                   संसाधित कर दिया गया है\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"यू०आर०पी०एम०क्यू० संस्मरण %s॥ सर्वाधिकार © २०००, २००१, २००२ मैनड्रैकसॉफ़्ट ॥यह एक मुक्त "
-"सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकारपत्र के अन्तर्गत पुनः वितरित किया जा सकता "
-"है।\n"
-"\n"
-"उपयोग विधि:\n"
+"  --virtual      - काल्पनिक माध्यम का निर्माण करना जो हमेशा अप-टु-डेट रहें,\n"
+"                   सिर्फ़  file:// प्रोटोकॉल की अनूमति है।\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - समूहों को नाम के साथ मुद्रित करें\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - शीर्ष कैच निर्देशिका को स्वच्छ करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - हार्डडिस्क सूची संचिकाओं का बल-पूर्वक निर्माण\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "सिर्फ़ महाउपयोगकर्ता को ही पैकेजों को संसाधित करने की अनुमति है"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "एक कुकर वितरण के उन्नयनों (अपडेट्स) को जोड़ा नहीं जा सकता है\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "समरूप प्रणालियों को %s पर पुनः प्राप्त किया जा रहा है ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" के लिए हार्डडिस्क संचिका-सूची को खोजने में असमर्थ, माध्यम स्वीकार नहीं है"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - लघु क्रिया-कलाप लंबाई, सामान्य संख्या %d है।\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "\"%s\" माध्यम को अपडेट करने में असमर्थ\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - बाँया कोष्टक का चिह्न समूह अभिव्यक्ति का खोलने के लिए\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "हटाने-योग्य माध्यम \"%s\" के लिए बहुत सारे आरोह बिंदु"
+msgid "`with' missing for network media\n"
+msgstr "नेटवर्क माध्यम `के साथ' विलुप्त\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर), सत्य यदि दोनों अभिव्यक्तियां "
-"सत्य है\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "\"%s\" माध्यम का निर्माण करने में असमर्थ\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"\"%s\" माध्यम की पहुँच में असमर्थ,\n"
-"यह सम्भव है जब आपने माध्यम का निर्माण करते समय, निर्देशिका कोस्वंम ही आरोहित किया हो।"
+"उपयोग विधि: urpmi.removemedia [-a] <नाम> ...\n"
+"जहाँ <नाम> एक माध्यम का नाम है जिसे हटाना है\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - सभी माध्यमों का चयन करें\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - सिर्फ़ दिए गए माध्यम का उपयोग करें, छोटे विराम चिह्न के द्वारा अलग "
-"किये हुए\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "कार्य संपादन का निर्माण करने में असमर्थ"
+"\n"
+"अज्ञात विकल्प '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "\"%s\" माध्यम से आर०पी०एम० संचिकाऐं पुनः प्राप्त की जा रही है..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"हटाने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए करें)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"आपने एक स्रोत पैकेज का चयन किया है:\n"
-"\n"
-"%s\n"
-"\n"
-"सम्भवता आप इसे अपने कम्प्यूटर पर संसाधित नहीं करना चाहते है (इसे संसाधित करने से,\n"
-"आपको इसके मूल-कूट में परिवर्तन करने की और इसे संकलन करने की अनुमति मिल जायेगी)।\n"
-"\n"
-"आप क्या करना चाहते है?"
+"हटायी जाने वाली प्रविष्टि लुप्त है\n"
+"(%s में से एक)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s वितिरण किया जा रहा है"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"उपयोग विधि: urpmi.update [विकल्प] <नाम> ...\n"
+"जहाँ <नाम> एक माध्यम का नाम है जिसे अपडेट करना है\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "संसाधन असफ़ल"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "संरचना-संचिका [%s] लिखें"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - जीपीजी कुँजी का बलपूर्वक उन्नयन ।\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - सभी स्थिर माध्यमों का चयन करें\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
+"करें)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
-"                   (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
+"अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
+"(%s में से एक)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"यू०आर०पी०एम०एफ़० संस्मरण %s॥ सर्वाधिकार © २००२ मैनड्रैकसॉफ़्ट ॥यह एक मुक्त सॉफ़्टवेयर है और "
+"जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित किया जा सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - उपलब्ध पैकेजों को दिखायें\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - उपलब्ध माध्यमों और उनके यूआरएल को दिखायें\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - अस्पष्ट खोज को लागू करें (--fuzzy जैसा)\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - यूआरपीएमआई.एडमीडीया.आर्गूमेन्ट (urpmi.addmedia argument) के "
+"प्रारुप में संरचना को डम्प करना।\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "ओ०के०"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - उपलब्ध नोडस को दिखायें, जब --parallel विकल्प का उपयोग किया जा "
+"रहा हो\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "हार्डडिस्क सूची संचिका में अवैध हार्डडिस्क सूची विवरण \"%s\""
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - उपलब्ध समान्तर नामों को दिखायें\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "%s को हटाया जा रहा है"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - शीर्षकों को, यू०आर०पी०एम०आई० डी०बी० में सूचीबद्व पैकेज के लिए "
+"एसटीडीआउट पर निकालें\n"
+"                    (सिर्फ़ महाउपयोगकर्ता)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - एक वितरण के एक्स एक्स एक्स भाग के लिए एक माध्यम का स्वतः निर्माण "
-"करें\n"
-"                    एक्स एक्स एक्स, मुख्य, अंशदान, अपडेट या\n"
-"                   कुछ भी और जिसे संरचित किया जा चुका है, होना चाहिए ;-)\n"
+"  --sources      - सभी स्रोत्र पैकेजों को डॉउनलोड के पहिले दें (सिर्फ़ महाउपयोगकर्ता)\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - एक वितरित वृक्ष के लिए यूआरपीएमआई की देखते-देखते संरचना।\n"
+"                   यह एक वितरण की पूछ-ताछ करने की अनुमति देता है।\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "%s को रखने के लिए"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  -changelog      - परिवर्तन लॉग का मुद्रण\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "असन्तुष्ट %s के कारण"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - जाँच को पैकेज की अधिनताओं तक ले जायें\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"पैकेजों का स्वचालित संसाधन...\n"
-"आपने %s पैकेजों के संसाधन का आग्रह किया है\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "-u             - पैकेज को हटायें यदि एक अत्यधिक नवीन संस्मरण पहिले सेसंसाधित है\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume   - अधूरी-डॉउनलोड-की-हुई संचिकाओं के स्थानान्तरण का पुनः आरम्भ\n"
-"                   (--no-resume इसे असक्रिय करता है, डिफ़ॉल्ट असक्रिय है)।\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - सम्पूर्ण आउटपुट को पैकेज के साथ हटायें\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - पैकेजों की जो आवश्यक है उससे विपरीत खोज करें\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - उपयोगी सूचनाओं का पठनीय रूप में मुद्रण\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - समूहों को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"आप अपने कम्प्यूटर पर निम्नलिखित सॉफ़्टवेयर पैकेज को अब संसाधित ही करने जा रहे है:\n"
-"\n"
-"%s\n"
-"\n"
-"आप हो सकता है कि इसे सिर्फ़ सुरक्षित करना चाहते है । आपकी पसन्द क्या है?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - संस्मरण और विमोचन संख्या को नाम के साथ मुद्रित करें\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - अस्पष्ट खोज को लागू करें (-y जैसा)\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  --l         - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "-u             - पैकेज को हटायें यदि एक अत्यधिक नवीन संस्मरण पहिले सेसंसाधित है\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  निर्देश वाक्य पर दिये हुए नामों या आर०पी०एम० संचिकाओं की जाँच की गई है\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - हार्डडिस्क सूची संचिका को खोजना और उपयोग करना\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes को सिर्फ़ --parallel के साथ उपयोग किया जा सकता है"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "%s के ना मिलने के कारण"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"उपयोग विधि: urpmi.update [विकल्प] <नाम> ...\n"
-"जहाँ <नाम> एक माध्यम का नाम है जिसे अपडेट करना है\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "विद्यमान माध्यम \"%s\" से अलग हट कर निकलने की चेष्टा, बच निकला जा रहा है"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s को संसाधित करने के लिए, निम्नलिखित पैकेजों में से एक की आवश्यकता है: "
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "यू०आर०पी०एम०क्यू० संस्मरण %s॥ सर्वाधिकार © २०००, २००१, २००२ मैनड्रैकसॉफ़्ट ॥यह एक "
+#~ "मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकारपत्र के अन्तर्गत पुनः वितरित किया जा "
+#~ "सकता है।\n"
+#~ "\n"
+#~ "उपयोग विधि:\n"
diff --git a/po/hr.po b/po/hr.po
index 3a770954..919407a3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2002-03-08 13:56CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -36,140 +36,321 @@ msgstr "YyDd"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instaliram %s\n"
+
+#: ../_irpm:33
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
+"Automatska instalacija paketa...\n"
+"Zatražili ste instalaciju paketa %s\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to open rpmdb"
-msgstr "ne mogu registrirati rpm datoteku"
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, c-format
+msgid "Is this OK?"
+msgstr "Da li se slažete s tim?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
+msgid "Ok"
+msgstr "U redu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jedan od slijedećih paketa je potreban za instaliranje %s:"
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: komanda nije pronađena\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "sve je već instalirano"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --all           - ispiši sve oznake."
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+msgid "unknown protocol defined for %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu napraviti hdlist: %s"
+
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
+#, c-format
+msgid "syntax error in config file at line %s"
+msgstr "greška u sintaksi u config datoteci na liniji %s"
+
+#: ../urpm.pm:174
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
+
+#: ../urpm.pm:180
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
+
+#: ../urpm.pm:196
+#, c-format
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
+"ne mogu se pobriniti za medij \"%s\" pošto se list datoteka već koristi za "
+"drugi medij"
 
-#: ../urpmi:1
+#: ../urpm.pm:202
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Izaberite jedan? (1-%d) "
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu koristiti \"%s\" za bezimeni medij zato što se to ime već koristi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "found %d headers in cache"
-msgstr "pronađeno %d zaglavlja u priručnoj memoriji"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne mogu uzeti medij \"%s\" u račun pošto list datoteka [%s] ne postoji"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "postoji više paketa sa istim rpm imenom datoteke \"%s\""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
+
+#: ../urpm.pm:222
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
+
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:249
 #, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
+
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
+
+#: ../urpm.pm:271
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu pronaći hdlist datoteku za \"%s\", medij ignoriran"
+
+#: ../urpm.pm:278
+#, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ne mogu pronaći list datoteku za \"%s\", medij ignoriran"
+
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
+
+#: ../urpm.pm:309
+#, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
+
+#: ../urpm.pm:342
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previše točaka montiranja za prenosivi medij \"%s\""
+
+#: ../urpm.pm:343
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "uzimam prenosivi uređaj kao \"%s\""
+
+#: ../urpm.pm:347
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koristim različite prenosive uređaje [%s] za \"%s\""
+
+#: ../urpm.pm:352 ../urpm.pm:355
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
+
+#: ../urpm.pm:368
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "ne mogu zapisati config datoteku [%s]"
+
+#: ../urpm.pm:390
+#, c-format
+msgid "write config file [%s]"
+msgstr "zapisana config datoteka [%s]"
+
+#: ../urpm.pm:402
+#, c-format
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ne mogu pristupiti rpm datoteci [%s]"
+
+#: ../urpm.pm:423
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "ispitujem hdlist datoteku [%s]"
+
+#: ../urpm.pm:433
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
+
+#: ../urpm.pm:437
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:441
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "dohvaćam rpms datoteku..."
+msgid "unable to use parallel option \"%s\""
+msgstr "ne mogu ažurirati medij \"%s\"\n"
 
-#: ../urpmq:1
+#: ../urpm.pm:452
 #, fuzzy, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...dohvaćanje neuspješno: %s"
+msgid "examining synthesis file [%s]"
+msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu provjeriti list datoteku za \"%s\", medij ignoriran"
+msgid "examining hdlist file [%s]"
+msgstr "ispitujem hdlist datoteku [%s]"
+
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
 
-#: ../urpmf:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
+#, fuzzy, c-format
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
+
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:563
+#, fuzzy, c-format
+msgid "skipping package %s"
+msgstr "ne postoji paket pod nazivom %s"
+
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
+#, fuzzy, c-format
+msgid "unable to open rpmdb"
+msgstr "ne mogu registrirati rpm datoteku"
+
+#: ../urpm.pm:622
 #, c-format
-msgid "Package installation..."
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" već postoji"
+
+#: ../urpm.pm:629
+#, c-format
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:661
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nepravilno ime rpm datoteke [%s]"
+msgid "added medium %s"
+msgstr "dodan medij %s"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:677
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "ne mogu pristupiti prvom instalacijskom mediju"
 
-#: ../urpmi:1
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "kopiram hdlists datoteku..."
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Instalacija nije uspjela"
+msgid "...copying failed"
+msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...kopiranje završeno"
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
@@ -178,700 +359,761 @@ msgstr ""
 "ne mogu pristupiti prvom instalacijskom mediju (nije pronađen Mandrake/base/"
 "hdlists)"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Žalim, loš odabir, pokušajte ponovo\n"
+msgid "retrieving hdlists file..."
+msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...dohvat završen"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - ispisuje oznaku summary: sažeto."
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
+#, c-format
+msgid "...retrieving failed: %s"
+msgstr "...dohvaćanje neuspješno: %s"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:720
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slijedeći paketi sadrže %s: %s"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalacija nije uspjela"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "pokušavam izabrati nepostojeći medij \"%s\""
 
-#: ../urpmi:1
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - koristi X sučelje.\n"
+#: ../urpm.pm:767
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "pokušavam izabrati višestruki medij: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jedan od slijedećih paketa je potreban:"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:783
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --best-output  - izaberi najbolje sučelje prema okruženju:\n"
-"                   X ili tekst mod.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:996
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
 
-#: ../urpmi:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
+msgid "copying description file of \"%s\"..."
+msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, fuzzy, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no package named %s"
-msgstr "ne postoji paket pod nazivom %s"
+#: ../urpm.pm:1038 ../urpm.pm:1278
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalacija neuspješna, neke datoteke nedostaju.\n"
-"Možda ćete poželjeti dograditi vašu urpmi bazu"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"uporaba: urpmi.removemedia [-a] <ime> ...\n"
-"gdje je <ime> ime medija za ukloniti.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
-"uvijek nije podržano\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1111
 #, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' nedostaje za ftp medij\n"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiranje [%s] neuspješno"
 
-#: ../urpmq:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --all           - ispiši sve oznake."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:1174
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "nepoznati paket(i) "
+msgid "reading rpm files from [%s]"
+msgstr "nisu pronađene rpm datoteke u [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Instalacija nije uspjela"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+
+#: ../urpm.pm:1204
+#, c-format
+msgid "no rpm files found from [%s]"
+msgstr "nisu pronađene rpm datoteke u [%s]"
+
+#: ../urpm.pm:1333
+#, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
-"uvijek nije podržano\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
+
+#: ../urpm.pm:1398
+#, c-format
+msgid "md5sum mismatch"
 msgstr ""
-"Kako bi zadovoljili sve ovisnosti paketa slijedeći moram instalirati "
-"slijedeće pakete (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne mogu uzeti medij \"%s\" u račun pošto list datoteka [%s] ne postoji"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - opširan mod.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "Initializing..."
-msgstr ""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --all           - ispiši sve oznake."
+msgid "unable to write list file of \"%s\""
+msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - ispiši sve oznake."
+msgid "writing list file for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
+msgid "nothing written in list file for \"%s\""
+msgstr "nema ništa za zapisati u list datoteku za \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "dohvaćam opis datoteka od \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1679
 #, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite Enter kada ste gotovi..."
+msgid "reading headers from medium \"%s\""
+msgstr "uklanjam medij \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznata opcija '%s'\n"
+msgid "building hdlist [%s]"
+msgstr "izgrađujem hdlist [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
+msgid "found %d headers in cache"
+msgstr "pronađeno %d zaglavlja u priručnoj memoriji"
 
-#: ../urpmi:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d zastarjelih zaglavlja u priručnoj memoriji"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --all           - ispiši sve oznake."
+#: ../urpm.pm:1893
+#, c-format
+msgid "mounting %s"
+msgstr "montiram %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "izgrađujem hdlist [%s]"
+msgid "unmounting %s"
+msgstr "odmontiravam %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
+msgid "relocated %s entries in depslist"
+msgstr "premješteno %s unosa u depslist-u"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
+#, c-format
+msgid "no entries relocated in depslist"
+msgstr "nema unosa premještenih u depslist"
+
+#: ../urpm.pm:1942
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "nepravilno ime rpm datoteke [%s]"
+
+#: ../urpm.pm:1948
 #, fuzzy, c-format
-msgid "examining MD5SUM file"
-msgstr "ispitujem hdlist datoteku [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "dohvaćam rpms datoteku..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nije pronađena\n"
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+msgid "error registering local packages"
+msgstr "greška prilikom registriranja lokalnih paketa"
+
+#: ../urpm.pm:2076
+#, c-format
+msgid "no package named %s"
+msgstr "ne postoji paket pod nazivom %s"
+
+#: ../urpm.pm:2079 ../urpme:88
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Slijedeći paketi sadrže %s: %s"
+
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji više paketa sa istim rpm imenom datoteke \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu napraviti hdlist: %s"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "dohvaćam hdlists datoteku..."
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Yes, really install it"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "added medium %s"
-msgstr "dodan medij %s"
+msgid "package %s is not found."
+msgstr "paket %s nije pronađen."
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
+msgid "urpmi database locked"
+msgstr "urpmi baza zaključana"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "md5sum mismatch"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "greška u sintaksi u config datoteci na liniji %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "nepotpun medij \"%s\" označen kao prenosiv ali nije zapravo"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se instaliraju.\n"
+#: ../urpm.pm:2574
+#, c-format
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu pristupiti mediju \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "nepravilan unos: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "dohvaćam rpms datoteku..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "premješteno %s unosa u depslist-u"
+msgid "Preparing..."
+msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
+#: ../urpm.pm:2752
+#, c-format
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
+#: ../urpm.pm:2783
+#, c-format
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+msgid "unable to create transaction"
+msgstr "ne mogu napraviti medij \"%s\"\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "dohvaćam rpms datoteku..."
+msgid "removing package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmf:1
+#: ../urpm.pm:2796
 #, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --serial        - ispisuje oznaku serial: serial."
+msgid "unable to remove package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2809
 #, fuzzy, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
+msgid "unable to install package %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmf:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" već postoji"
-
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
-msgstr "instaliram %s\n"
+msgid "due to missing %s"
+msgstr "wget nedostaje\n"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "due to unsatisfied %s"
 msgstr ""
-"nedostaje unos za nadogradnju\n"
-"(jedan od %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "odabirem %s izabiranjem datoteka"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "unable to remove package %s"
+msgid "in order to keep %s"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
+msgid "in order to install %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "due to conflicts with %s"
 msgstr ""
-"nedostaje unos za uklanjanje\n"
-"(jedan od %s)\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - odaberi sve medije.\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "Missing signature (%s)"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
-
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid " (Y/n) "
-msgstr " (D/n) "
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Žalim, loš odabir, pokušajte ponovo\n"
 
-#: ../urpm.pm:1
+#: ../urpme:36
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi inačica %s\n"
+"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
 
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "nepravilan unos: [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmq:1
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --all           - ispiši sve oznake."
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
 
-#: ../urpmi:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nema unosa premještenih u depslist"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpmi:1
+#: ../urpme:47
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:1
+#: ../urpme:50
 #, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "do you agree ?"
-msgstr ""
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "nepoznati paket(i) "
 
-#: ../urpm.pm:1
-#, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nepotpuna list datoteka za \"%s\", medij ignoriran"
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "nepoznati paket(i) "
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving done"
-msgstr "...dohvat završen"
+#: ../urpme:93
+#, fuzzy, c-format
+msgid "removing package %s will break your system"
+msgstr "uklanjanje paketa %s će pokvariti vaš sustav\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+#: ../urpme:95
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nema ništa za ukloniti.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "ne postoji paket pod nazivom %s"
+msgid "Checking to remove the following packages"
+msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpmi:1
-#, c-format
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+
+#: ../urpme:115
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...kopiranje neuspješno"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpmi inačica %s\n"
-"Autorska prava (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"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"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu odrediti medij od navedene hdlist datoteke [%s]"
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - opširan mod.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to conflicts with %s"
+#: ../urpmf:39
+#, fuzzy, c-format
+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"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d zastarjelih zaglavlja u priručnoj memoriji"
+#: ../urpmf:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --size          - ispisuje oznaku size: veličinu."
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu ažurirati medij \"%s\"\n"
+#: ../urpmf:42
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi:1
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - ispisuje oznaku size: veličinu."
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - ispisuje oznaku size: veličinu."
+
+#: ../urpmf:46
+#, fuzzy, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - ispisuje oznaku summary: sažeto."
+
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - ispisuje oznaku description: opis."
+
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpmf:49
+#, fuzzy, c-format
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
+
+#: ../urpmf:51
+#, fuzzy, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --serial        - ispisuje oznaku serial: serial."
+
+#: ../urpmf:52
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
+"  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:53
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --all           - ispiši sve oznake."
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristim različite prenosive uređaje [%s] za \"%s\""
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:55
 #, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
-"  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
-"datoteku.\n"
+"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
+
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiranje [%s] neuspješno"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
+
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:64
 #, fuzzy, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
+
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"ne mogu koristiti \"%s\" za bezimeni medij zato što se to ime već koristi"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
+#, c-format
+msgid "using specific environment on %s\n"
 msgstr ""
-"  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmf:150
+#, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
+#: ../urpmi:72
+#, c-format
 msgid ""
-"urpme version %s\n"
+"urpmi version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -884,742 +1126,676 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:82
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
-"uporaba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanjom>]\n"
-"gdje je <url> jedan od\n"
-"       file://<putanja>\n"
-"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativnim imenom od "
-"hdlist>\n"
-"       ftp://<host>/<putanja> with <relativnim imenom od hdlist>\n"
-"       http://<host>/<putanja> with <relativnim imenom od hdlist>\n"
-"       removable://<putanja>\n"
-"\n"
-"i [opcije] su od\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "...copying done"
-msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu ažurirati medij \"%s\"\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automatski izaberi pakete za dogradnju sustava.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ne mogu pristupiti prvom instalacijskom mediju"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "virtual medium need to be local"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "error registering local packages"
-msgstr "greška prilikom registriranja lokalnih paketa"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:91
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
-
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - uključi fuzzy pretraživanje (isto kao -y).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nisu pronađene rpm datoteke u [%s]"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
+"s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nema ništa za zapisati u list datoteku za \"%s\""
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Slijedeći paketi sadrže %s: %s"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    komandnoj liniji ali bez imena paketa)."
+#: ../urpmi:96
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+#: ../urpmi:98
+#, c-format
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:104
 #, c-format
-msgid "Save file"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne mogu zapisati config datoteku [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - prisili pozivanje iako neki paketi ne postoje.\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
-"datoteku.\n"
 
-#: ../urpmi:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi:115
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:119
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativna putanja do hdlist> nedostaje\n"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Jedan od slijedećih paketa je potreban:"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - koristi X sučelje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "unrequested"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - izaberi najbolje sučelje prema okruženju:\n"
+"                   X ili tekst mod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu pristupiti rpm datoteci [%s]"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ne mogu pristupiti rpm datoteci [%s]"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu pročitati rpm datoteku [%s] sa medija \"%s\""
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
 
-#: ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
+"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -v             - uključi fuzzy pretraživanje (isto kao --fuzzy).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - slijedeći paket je izvorišni paket (isto kao --src).\n"
 
-#: ../urpme:1
+#: ../urpmi:132
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, fuzzy, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se instaliraju.\n"
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "unmounting %s"
-msgstr "odmontiravam %s"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "restarting urpmi"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ispitujem synthesis datoteku [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "...kopiranje završeno"
-
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi mod.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - opširan mod.\n"
+msgid "Save file"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
 
-#: ../urpmq:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
-"                   stdout (root samo).\n"
 
-#: ../urpme:1
+#: ../urpmi:240
 #, fuzzy, c-format
-msgid "unknown packages"
-msgstr "nepoznati paket(i) "
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "pokušavam izabrati višestruki medij: %s"
+msgid "Copying failed"
+msgstr "Kopiranje završeno"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:260
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+msgid "One of the following packages is needed:"
+msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:403
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr ""
-"nema ništa za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Izaberite jedan? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ne mogu pronaći list datoteku za \"%s\", medij ignoriran"
+msgid "Package installation..."
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - ispiši ovaj tekst s pomoći.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
+msgid "Initializing..."
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+#: ../urpmi:440 ../urpmi:466
+#, c-format
+msgid "do you agree ?"
 msgstr ""
-"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, 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"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\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"
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
+"uvijek nije podržano\n"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --quiet         - ne ispisuje ime oznake (podrazumijevano ako nije dana "
-"oznaka na komandnoj"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --size          - ispisuje oznaku size: veličinu."
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
+"uvijek nije podržano\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, fuzzy, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "  --all           - ispiši sve oznake."
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Kako bi zadovoljili sve ovisnosti paketa slijedeći moram instalirati "
+"slijedeće pakete (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
+"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Da li se slažete s tim?"
-
-#: ../urpmi:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr ""
+msgid "unable to get source packages, aborting"
+msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ispitujem hdlist datoteku [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Nema ništa za ukloniti.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "ne mogu zapisati list datoteku za \"%s\""
+msgid "Press Enter when ready..."
+msgstr "Pritisnite Enter kada ste gotovi..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "uklanjam medij \"%s\""
-
-#: ../urpmq:1
-#, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - proširi ispitivanje ovisnosti paketa.\n"
+msgid "Downloading package `%s'..."
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi:1
+#: ../urpmi:597
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
+msgid "The following packages have bad signatures"
+msgstr "Slijedeći paketi sadrže %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne mogu zapisati list datoteku za \"%s\""
+msgid "Do you want to continue installation ?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
+"Instalacija neuspješna, neke datoteke nedostaju.\n"
+"Možda ćete poželjeti dograditi vašu urpmi bazu"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "pokušavam izabrati nepostojeći medij \"%s\""
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpmf:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - ispisuje oznaku description: opis."
+msgid "distributing %s"
+msgstr "instaliram %s\n"
 
-#: ../urpmi:1
+#: ../urpmi:673
 #, fuzzy, c-format
-msgid "Copying failed"
-msgstr "Kopiranje završeno"
+msgid "installing %s"
+msgstr "instaliram %s\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:688
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --all           - ispiši sve oznake."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:731
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - slijedeći paket je izvorišni paket (isto kao --src).\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "instaliram %s\n"
+msgid "%d installation transactions failed"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "nisu pronađene rpm datoteke u [%s]"
+msgid "Installation is possible"
+msgstr "Instalacija nije uspjela"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiranje opisne datoteke od \"%s\"..."
+msgid "Everything already installed"
+msgstr "sve je već instalirano"
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatski izaberi dobar paket u izborima.\n"
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "...kopiranje neuspješno"
-
-#: ../urpmi.addmedia:1
-#, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
+"uporaba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanjom>]\n"
+"gdje je <url> jedan od\n"
+"       file://<putanja>\n"
+"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativnim imenom od "
+"hdlist>\n"
+"       ftp://<host>/<putanja> with <relativnim imenom od hdlist>\n"
+"       http://<host>/<putanja> with <relativnim imenom od hdlist>\n"
+"       removable://<putanja>\n"
+"\n"
+"i [opcije] su od\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "paket %s nije pronađen."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
-
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - napravi medij za dogradnju.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Odustani"
+#: ../urpmi.addmedia:56
+#, fuzzy, c-format
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
+"datoteku.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
-"  --src          - slijedeći paket je izvorišni(source) paket (isto kao -"
-"s).\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:58
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
+"  -h             - pokušaj pronaći i koristiti synthesis ili hdlist "
+"datoteku.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu pristupiti mediju \"%s\""
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu napraviti medij \"%s\"\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
+#: ../urpmi.addmedia:67
+#, c-format
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
-"%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - ispiši sve oznake."
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "dohvaćam rpms datoteku..."
+
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "ispitujem hdlist datoteku [%s]"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopiram hdlists datoteku..."
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu ažurirati medij \"%s\"\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativna putanja do hdlist> nedostaje\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
+msgid "`with' missing for network media\n"
+msgstr "`with' nedostaje za ftp medij\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu napraviti medij \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "Do nothing"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"uporaba: urpmi.removemedia [-a] <ime> ...\n"
+"gdje je <ime> ime medija za ukloniti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - odaberi sve medije.\n"
+
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"nepoznata opcija '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "mounting %s"
-msgstr "montiram %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nema ništa za uklanjanje (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"ne mogu se pobriniti za medij \"%s\" pošto se list datoteka već koristi za "
-"drugi medij"
+"nedostaje unos za uklanjanje\n"
+"(jedan od %s)\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:28
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uporaba: urpmi.update [opcije] <ime> ...\n"
+"gdje je <ime> ime medija za dogradnju.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:38
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:40
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
+#: ../urpmi.update:41
+#, c-format
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - odaberi sve neprenosive medije.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ne mogu zapisati list datoteku za \"%s\""
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"nedostaje unos za nadogradnju\n"
+"(jedan od %s)\n"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1631,280 +1807,150 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
-
-#: ../urpmq:1
+#: ../urpmq:53
 #, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - ispiši groupe također sa imenom.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
-
-#: ../urpmi:1
-#, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu pronaći hdlist datoteku za \"%s\", medij ignoriran"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "  --list         - list available packages.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmf:1
+#: ../urpmq:54
 #, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše točaka montiranja za prenosivi medij \"%s\""
+msgid "  --list-media   - list available media.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmf:1
+#: ../urpmq:55
 #, fuzzy, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpm.pm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo medije popisane zarezom.\n"
-
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "ne mogu napraviti medij \"%s\"\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "dohvaćam rpms datoteku..."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - izdvoji zaglavlja za pakete popisane iz urpmi baze na\n"
+"                   stdout (root samo).\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "instaliram %s\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "write config file [%s]"
-msgstr "zapisana config datoteka [%s]"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - odaberi sve neprenosive medije.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - ispisuje oznaku size: veličinu."
-
-#: ../urpmi:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
+"  --sources      - daj sve izvorne pakete prije skidanja (root samo).\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za dogradnju.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:75
 #, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --changelog    - print changelog.\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:77
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -v             - uključi fuzzy pretraživanje (isto kao --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nepravilni hdlist opis \"%s\" u hdlists datoteci"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - proširi ispitivanje ovisnosti paketa.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:78
 #, fuzzy, c-format
-msgid "removing %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpmi.addmedia:1
-#, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
-msgstr ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
 
-#: ../urpmf:1
+#: ../urpmq:80
 #, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - ispisuje oznaku size: veličinu."
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    komandnoj liniji ali bez imena paketa)."
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
-
-#: ../_irpm:1
-#, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Automatska instalacija paketa...\n"
-"Zatražili ste instalaciju paketa %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi baza zaključana"
-
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
+"  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "dohvaćam opis datoteka od \"%s\"..."
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+#: ../urpmq:86
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - ispiši groupe također sa imenom.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosivi uređaj kao \"%s\""
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - ispiši verzije i izdanja također sa imenom.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - uključi fuzzy pretraživanje (isto kao -y).\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
 
-#: ../urpmq:1
+#: ../urpmq:150
 #, fuzzy, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - ukloni paket ukoliko bolja inačica već postoji.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:327
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget nedostaje\n"
+msgid "No filelist found\n"
+msgstr "nije pronađen popis punih medija"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:398
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"uporaba: urpmi.update [opcije] <ime> ...\n"
-"gdje je <ime> ime medija za dogradnju.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Jedan od slijedećih paketa je potreban za instaliranje %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #, fuzzy
 #~ msgid "copy failed: %s"
@@ -2080,9 +2126,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "probajte urpmf --help za više opcija"
 
-#~ msgid "no full media list was found"
-#~ msgstr "nije pronađen popis punih medija"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "kopiram popis izvora od \"%s\"..."
 
diff --git a/po/hu.po b/po/hu.po
index a7301c59..93ea4978 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-09-13 23:08+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -40,903 +40,818 @@ msgstr "IiyY"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s telepítése folyamatban\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - az összes adatforrás létrehozása telepítési "
-"adatforrásból\n"
+"A csomagok automatikus telepítése...\n"
+"A(z) %s csomag telepítését kérte...\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "az rpmdb megnyitása nem sikerült"
+msgid "Is this OK?"
+msgstr "Így rendben van?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - jelen segítség megjelenítése\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Mégsem"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "a(z) %s csomag eltávolítása folyik"
+msgid " (Y/n) "
+msgstr " (I/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: a parancs nem található\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Már minden telepítve van"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - jelen segítség megjelenítése\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - csoport megjelenítése\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "a tranzakció a következő folyamattal lesz végrehajtva: %d"
+msgid "unknown protocol defined for %s"
+msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:79
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - szolgáltatásjegyzék megjelenítése (mindet)\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Melyiket választja? (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "protokollkezelés sikertelen: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d fejléc található a gyorstárban"
+msgid "syntax error in config file at line %s"
+msgstr "szintaktikai hiba a konfigurációs fájl következő sorában: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "több csomag létezik azonos RPM fájlnévvel: \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált használni; "
+"az adatforrás nem kerül feldolgozásra"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"  --proxy-user   - proxyhoz használandó felhasználónév és jelszó\n"
-"                   (formátum: <felhasználónév:jelszó>)\n"
+"a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
+"adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "függőségek meghatározása - második lépés\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"a(z) \"%s\" adatforrás nem kezelhető, mivel a listafájlt már használja egy "
+"másik adatforrás"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "RPM fájl behozatala: \"%s\"..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" név nem adható az adatforrásnak, mivel már van ilyen név"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"a(z) \"%s\" adatforrás nem vehető figyelembe, mivel \"%s\" listafájl nem "
+"létezik"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...a behozatal sikertelen: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "a fejléclistához tartozó adatforrás nem határozható meg: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
-"\"%s\" listafájljának vizsgálata sikertelen; az adatforrás nem kerül "
-"feldolgozásra"
+"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - bináris VAGY művelet: akkor igaz, ha legalább\n"
-"                   az egyik kifejezés igaz\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Csomagtelepítés..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "a(z) \"%s\" néven létező adatforrás elkerülése"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "érvénytelen csomagfájlnév: \"%s\""
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
+"listafájl, ezért az adatforrás nem lesz feldolgozva"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "helytelen proxy-megadás a parancssorban\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
+"adatforrás nem kerül feldolgozásra"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d telepítési művelet nem sikerült"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+"\"%s\" fejléclistája nem található; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
-"az első telepítési adatforrás nem elérhető (Mandrake/base/hdlists fájl nem "
-"található)"
+"\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Ezt nem lehet választani, próbálja meg újra\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"hibás listafájl a(z) \"%s\" adatforráshoz; az adatforrás nem kerül "
+"feldolgozásra"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
+"\"%s\" listafájljának vizsgálata sikertelen; az adatforrás nem kerül "
+"feldolgozásra"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - összefoglaló megjelenítése\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
+msgid "taking removable device as \"%s\""
+msgstr "a cserélhető eszköz a következőnek lesz véve: \"%s\""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "A telepítés nem sikerült"
+#: ../urpm.pm:347
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - futtatás az X grafikus felületen\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "A következő csomagok valamelyikére szükség van:"
+msgid "unable to write config file [%s]"
+msgstr "a beállítások mentése nem sikerült: \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"A függőségek feloldásához a következő csomagok el lesznek távolítva (%d MB)"
+msgid "write config file [%s]"
+msgstr "beállítások mentése: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - a lehetőségek közül a legmegfelelőbb felületet\n"
-"                   használja a program: grafikus (X) vagy karakteres\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "A(z) '%s' csomag letöltése folyik..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%s\" elemzése sikertelen a következő fájlban: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Mit lehet tenni bináris RPM fájlokkal, ha --install-src van megadva"
+msgid "examining parallel handler in file [%s]"
+msgstr "párhuzamosság vizsgálata a következő fájlban: \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "párhuzamosság van definiálva a következő gépekre: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "nincs ilyen nevű csomag: %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "\"%s\" párhuzamossági opció nem használható"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak:\n"
-"%s\n"
-"Érdemes lehet frissíteni az urpmi adatbázist."
+"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
+"--update, --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Használat: urpmi.removemedia [-a] <név> ...\n"
-"ahol <név> az eltávolítandó adatforrás neve.\n"
+msgid "examining synthesis file [%s]"
+msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"A telepítés nem folytatható, mert a következő csomagokat el kell\n"
-"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "fejléclista vizsgálata: \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - az elérhető csomagok listázása\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "a(z) \"%s\" virtuális adatforrás nem helyi, ezért nem lesz feldolgozva"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "ismeretlen csomag"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr ""
+"hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
+"függőséglistájának olvasásakor"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "A telepítés elvégezhető"
+msgid "performing second pass to compute dependencies\n"
+msgstr "függőségek meghatározása - második lépés\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
-"frissíthetők legyenek:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "a(z) %s csomag kihagyása"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"A függőségek feloldásához a következő csomagok telepítésre kerülnek (%d MB)"
+# %s egy csomag teljes neve
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "csomagfrissítés helyett telepítés szükséges: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"a(z) \"%s\" adatforrás nem vehető figyelembe, mivel \"%s\" listafájl nem "
-"létezik"
+msgid "unable to open rpmdb"
+msgstr "az rpmdb megnyitása nem sikerült"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (i/N) "
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" adatforrás már létezik"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "egy Cooker disztribúció frissítései nem vehetők fel\n"
+msgid "virtual medium need to be local"
+msgstr "minden virtuális adatforrásnak helyinek kell lennie"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - részletes információ\n"
+msgid "added medium %s"
+msgstr "\"%s\" adatforrás felvéve"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializálás..."
+msgid "unable to access first installation medium"
+msgstr "az első telepítési adatforrás nem elérhető"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - az elérhető csomagok listázása\n"
+msgid "copying hdlists file..."
+msgstr "fejléclista másolása..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - az összes adat megjelenítése\n"
+msgid "...copying failed"
+msgstr "...a másolás sikertelen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
+msgid "...copying done"
+msgstr "...másolás megtörtént"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
-"listafájl, ezért az adatforrás nem lesz feldolgozva"
+"az első telepítési adatforrás nem elérhető (Mandrake/base/hdlists fájl nem "
+"található)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
-"ellenőrzőösszegének kiszámítása"
+msgid "retrieving hdlists file..."
+msgstr "fejléclista behozatala..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-"  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
+msgid "...retrieving done"
+msgstr "...behozatal megtörtént"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
+msgid "...retrieving failed: %s"
+msgstr "...a behozatal sikertelen: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ismeretlen opciók: \"%s\"\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "érvénytelen fejléclista-leírás a fejléclista-fájlban: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - a műveletek több részre bontása a megadottnál több "
-"csomag\n"
-"                   telepítése vagy frissítése esetén,\n"
-"                   az alapértelmezés szerinti érték: %d\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "kísérlet történt nem létező adatforrás (\"%s\") kiválasztására"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr ""
-"hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
-"függőséglistájának olvasásakor"
+msgid "selecting multiple media: %s"
+msgstr "több adatforrás kijelölése: \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
+msgid "removing medium \"%s\""
+msgstr "\"%s\" adatforrás eltávolítása"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "fejléclista készítése: \"%s\""
+"A(z) \"%s\" adatforrás nem elérhető.\n"
+"Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
+"megfelelő könyvtár."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - a már telepített csomagok megtartása, ha lehetséges - a\n"
-"                   törlést igénylő csomagok nem kerülnek telepítésre\n"
+"a(z) \"%s\" virtuális adatforrás fejléclistája vagy kiterjesztett "
+"függőséglistája nem érvényes, ezért az adatforrás nem kerül feldolgozásra"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "az MD5SUM fájl vizsgálata"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" leírásfájljának másolása..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: a parancs nem található\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr ""
+"a talált forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
+"összegének kiszámítása..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "az RPM csomagfájl nem regisztrálható"
+msgid "examining MD5SUM file"
+msgstr "az MD5SUM fájl vizsgálata"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
-"  --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
-"                   telepítését (a felhasználótól érkező megerősítést "
-"követően)\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "protokollkezelés sikertelen: %s"
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"másolása..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "fejléclista behozatala..."
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "Yes, really install it"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
+"a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
+"ellenőrzőösszegének kiszámítása"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr "\"%s\" adatforrás felvéve"
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "a(z) \"%s\" másolása nem sikerült"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
-"  --noclean      - a nem használt RPM fájlok maradjanak a gyorstárban\n"
+"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
-"frissítés=%d)"
+msgid "reading rpm files from [%s]"
+msgstr "csomagfájlok (RPM) olvasása innen: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "md5sum mismatch"
-msgstr "hibás MD5-ös ellenőrzőösszeg"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "szintaktikai hiba a konfigurációs fájl következő sorában: %s"
+msgid "no rpm files found from [%s]"
+msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
-"  a parancssorban megadott csomagok illetve RPM fájlok lesznek telepítve\n"
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"behozatala..."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1356
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
-"  --proxy        - a megadott HTTP proxy használata; a portszám "
-"alapértelmezés\n"
-"                   szerint 1080 (formátum: <proxygép[:port]>)\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to install %s"
-msgstr "\"%s\" telepítése érdekében"
+"a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "bejegyzések áthelyezve a függőséglistában: %s"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr ""
+"a letöltött forrás-fejléclista (vagy a kiterjesztett függőséglista) MD5-ös "
+"összegének kiszámítása folyik"
 
-#: ../urpmf:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
+msgid "md5sum mismatch"
+msgstr "hibás MD5-ös ellenőrzőösszeg"
 
-#: ../urpmi:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
-"A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
-"\"%s\""
+"a forrás-fejléclista (vagy a kiterjesztett függőséglista) beolvasása nem "
+"sikerült"
 
-# %s egy csomag teljes neve
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "csomagfrissítés helyett telepítés szükséges: \"%s\""
+msgid "no hdlist file found for medium \"%s\""
+msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "tükörkiszolgálók behozatala: %s..."
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "A(z) \"%s\" fájl már fel lett használva ugyanezen adatforráson: \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - URL megjelenítése\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "fejléclista nem elemezhető: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ismeretlen protokoll van definiálva ehhez: \"%s\""
+msgid "unable to write list file of \"%s\""
+msgstr "a(z) \"%s\" listafájlja nem írható"
 
-#: ../urpmq:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
-"  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+msgid "writing list file for medium \"%s\""
+msgstr "a(z) \"%s\" adatforrás listafájljának írása"
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - az elavult csomagok megjelenítése (mindet)\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "semmi nem került a listafájlba: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" adatforrás már létezik"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "installing %s\n"
-msgstr "%s telepítése folyamatban\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1613
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a frissítendő bejegyzés hiányzik\n"
-"(valamelyik ezek közül: %s)\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
 
-# Francois Pons:
-# This is a message saying that a package is removed (or unselected) because the
-# dependency resolution algorithm needed to remove (or unselect) it when it tried
-# to promote a provide (a package name or property) with a better version, but it
-# failed.
-# "promote": It is a term used to say promotion of a provides (promoting perl for
-# example, is trying to find the best package providing perl and select it).
-# "%s" stands for the property being promoted, generally a simple name.
-# This is not really a failure message but an informative message. It has nothing
-# to do with failure in the sense of the application unable to continue. Urpmi
-# continues by not selecting a package which was selected by a promotion (not
-# asked by the user directly but caused by a package which has been upgraded thus
-# breaking existing packages, the promotion concerns this).
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "trying to promote %s"
-msgstr "a legalkalmasabb \"%s\" keresése"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" adatforrás fejléceinek olvasása"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "unable to remove package %s"
-msgstr "a(z) \"%s\" csomag eltávolítása sikertelen"
+msgid "building hdlist [%s]"
+msgstr "fejléclista készítése: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr ""
-"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "kiterjesztett függőséglista készítése ehhez: \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a törlendő bejegyzés hiányzik\n"
-"(valamelyik ezek közül: %s)\n"
+msgid "found %d headers in cache"
+msgstr "%d fejléc található a gyorstárban"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - az összes adatforrás kijelölése\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "%d elavult fejléc eltávolítása a gyorstárból"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Hiányzó elektronikus aláírás (%s)"
+msgid "mounting %s"
+msgstr "%s csatolása"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
+msgid "unmounting %s"
+msgstr "%s leválasztása"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
+msgid "relocated %s entries in depslist"
+msgstr "bejegyzések áthelyezve a függőséglistában: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "no entries relocated in depslist"
+msgstr "egyetlen bejegyzés sem került áthelyezésre a függőséglistában"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - csak frissítési adatforrás legyen frissítve\n"
+msgid "invalid rpm file name [%s]"
+msgstr "érvénytelen csomagfájlnév: \"%s\""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1948
 #, c-format
-msgid " (Y/n) "
-msgstr " (I/n) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - csoport megjelenítése\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "RPM fájl behozatala: \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
-"adatforrás nem kerül feldolgozásra"
+msgid "unable to access rpm file [%s]"
+msgstr "a csomagfájl nem elérhető: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "hibás bevitel: \"%s\""
+msgid "unable to register rpm file"
+msgstr "az RPM csomagfájl nem regisztrálható"
 
-#: ../urpme:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
+msgid "error registering local packages"
+msgstr "hiba a helyi csomagok regisztrálásakor"
 
-#: ../urpmq:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - az elérhető adatforrások listázása\n"
+msgid "no package named %s"
+msgstr "nincs ilyen nevű csomag: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"A kért csomagok közül néhányat nem lehet telepíteni:\n"
-"%s"
+msgid "The following packages contain %s: %s"
+msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "több csomag létezik azonos RPM fájlnévvel: \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "egyetlen bejegyzés sem került áthelyezésre a függőséglistában"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "\"%s\" elemzése sikertelen; a helytelen érték: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
+"a(z) \"%s\" adatforrás érvénytelen listafájlt használ:\n"
+"  valószínűleg nem naprakész a tükörkiszolgáló tartalma, ezért más mód lesz "
+"kipróbálva"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "a(z) \"%s\" adatforrás nem definiálja az RPM fájlok helyét"
 
-#: ../urpmf:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
+msgid "package %s is not found."
+msgstr "a csomag nem található: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "do you agree ?"
-msgstr "Rendben van így?"
+msgid "urpmi database locked"
+msgstr "az urpmi adatbázis zárolt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
-"hibás listafájl a(z) \"%s\" adatforráshoz; az adatforrás nem kerül "
-"feldolgozásra"
+msgid "medium \"%s\" is not selected"
+msgstr "a(z) \"%s\" adatforrás nincs kijelölve"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "...retrieving done"
-msgstr "...behozatal megtörtént"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "a(z) \"%s\" csomagfájl (RPM) nem olvasható a(z) \"%s\" adatforrásból"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "csomag hozzáadása - %s (azonosító=%d, eid=%d, frissítés=%d, fájl=%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "skipping package %s"
-msgstr "a(z) %s csomag kihagyása"
+msgid "unable to access medium \"%s\""
+msgstr "a(z) \"%s\" adatforrás nem elérhető"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Érvénytelen elektronikus aláírás (%s)"
+msgid "malformed input: [%s]"
+msgstr "hibás bevitel: \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  a parancssorban megadott csomagok illetve RPM fájlok lesznek lekérdezve\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "RPM fájlok behozatala a(z) \"%s\" adatforrásból..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi %s\n"
-"Copyright Š 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
+msgid "Preparing..."
+msgstr "Előkészítés..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "\"%s\" elemzése sikertelen; a helytelen érték: \"%s\""
+msgid "using process %d for executing transaction"
+msgstr "a tranzakció a következő folyamattal lesz végrehajtva: %d"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
-"                   feldolgozásának mellőzése\n"
+"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
+"frissítés=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "a fejléclistához tartozó adatforrás nem határozható meg: \"%s\""
+msgid "unable to create transaction"
+msgstr "egy művelet elvégzése nem sikerült"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "fejléclista nem elemezhető: \"%s\""
+msgid "removing package %s"
+msgstr "a(z) %s csomag eltávolítása folyik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált használni; "
-"az adatforrás nem kerül feldolgozásra"
+msgid "unable to remove package %s"
+msgstr "a(z) \"%s\" csomag eltávolítása sikertelen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ezzel való ütközés miatt: \"%s\""
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "csomag hozzáadása - %s (azonosító=%d, eid=%d, frissítés=%d, fájl=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "%d elavult fejléc eltávolítása a gyorstárból"
+msgid "unable to install package %s"
+msgstr "a(z) \"%s\" csomag telepítése sikertelen"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
+msgid "due to missing %s"
+msgstr "\"%s\" hiánya miatt"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-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) "
+msgid "due to unsatisfied %s"
+msgstr "\"%s\" igényei miatt"
 
-#: ../urpm.pm:1
+# Francois Pons:
+# This is a message saying that a package is removed (or unselected) because the
+# dependency resolution algorithm needed to remove (or unselect) it when it tried
+# to promote a provide (a package name or property) with a better version, but it
+# failed.
+# "promote": It is a term used to say promotion of a provides (promoting perl for
+# example, is trying to find the best package providing perl and select it).
+# "%s" stands for the property being promoted, generally a simple name.
+# This is not really a failure message but an informative message. It has nothing
+# to do with failure in the sense of the application unable to continue. Urpmi
+# continues by not selecting a package which was selected by a promotion (not
+# asked by the user directly but caused by a package which has been upgraded thus
+# breaking existing packages, the promotion concerns this).
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "a(z) \"%s\" virtuális adatforrás nem helyi, ezért nem lesz feldolgozva"
+msgid "trying to promote %s"
+msgstr "a legalkalmasabb \"%s\" keresése"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Előkészítés..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - az elérhető csomagok listázása\n"
+msgid "in order to keep %s"
+msgstr "\"%s\" megtartása érdekében"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
+msgid "in order to install %s"
+msgstr "\"%s\" telepítése érdekében"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - fejléclista illetve kiterjesztett függőséglista\n"
-"                   keresésének mellőzése\n"
+msgid "due to conflicts with %s"
+msgstr "ezzel való ütközés miatt: \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "a(z) \"%s\" másolása nem sikerült"
+msgid "unrequested"
+msgstr "nem volt kérve"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Érvénytelen elektronikus aláírás (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Érvénytelen kulcsazonosító (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - RPM fájl eltávolítása a gyorstárból a műveletek előtt\n"
+msgid "Missing signature (%s)"
+msgstr "Hiányzó elektronikus aláírás (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" név nem adható az adatforrásnak, mivel már van ilyen név"
+msgid "bad proxy declaration on command line\n"
+msgstr "helytelen proxy-megadás a parancssorban\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - az ütközések megjelenítése (mindet)\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"a(z) \"%s\" virtuális adatforrás fejléclistája vagy kiterjesztett "
-"függőséglistája nem érvényes, ezért az adatforrás nem kerül feldolgozásra"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Ezt nem lehet választani, próbálja meg újra\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -952,1113 +867,1244 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - jelen segítség megjelenítése\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"Használat: urpmi.addmedia [opciók] <név> <URL> [with <relatív_útvonal>]\n"
-"ahol <URL> az alábbiak egyike lehet:\n"
-"       file://<elérési út>\n"
-"       ftp://<felhasználónév>:<jelszó>@<gépnév>/<elérési út> with <a "
-"fejléclista relatív fájlneve>\n"
-"       ftp://<gépnév>/<elérési út> with <a fejléclista relatív fájlneve>\n"
-"       http://<gépnév>/<elérési út> with <a fejléclista relatív fájlneve>\n"
-"       removable://<elérési út>\n"
-"\n"
-"az [opciók] pedig a következők lehetnek:\n"
+"  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
-"másolása..."
+"  --test         - annak ellenőrzése, hogy a telepítés végrehajtható-e\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "...copying done"
-msgstr "...másolás megtörtént"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "\"%s\" párhuzamossági opció nem használható"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
+
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"a(z) \"%s\" adatforrás érvénytelen listafájlt használ:\n"
-"  valószínűleg nem naprakész a tükörkiszolgáló tartalma, ezért más mód lesz "
-"kipróbálva"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "az első telepítési adatforrás nem elérhető"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - részletes információ\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "minden virtuális adatforrásnak helyinek kell lennie"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "hiba a helyi csomagok regisztrálásakor"
+msgid "unknown packages"
+msgstr "ismeretlen csomagok"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
+msgid "unknown package"
+msgstr "ismeretlen csomag"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr ""
-"a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
+msgid "removing package %s will break your system"
+msgstr "a(z) \"%s\" csomag eltávolítása tönkreteheti a rendszert"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr ""
-"a forrás-fejléclista (vagy a kiterjesztett függőséglista) beolvasása nem "
-"sikerült"
+msgid "Nothing to remove"
+msgstr "Nincs mit eltávolítani"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+msgid "Checking to remove the following packages"
+msgstr "Ellenőrzés a következő csomagok eltávolításához"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "semmi nem került a listafájlba: \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"A függőségek feloldásához a következő csomagok el lesznek távolítva (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
+msgid " (y/N) "
+msgstr " (i/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "removing %s"
+msgstr "\"%s\" eltávolítása"
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "Az eltávolítás sikertelen"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"a talált forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
-"összegének kiszámítása..."
+"urpmf %s\n"
+"Copyright Š MandrakeSoft, 2002.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
 
-#: ../urpmq:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
+"  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
+"                   használata\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to install package %s"
-msgstr "a(z) \"%s\" csomag telepítése sikertelen"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - a felsorolt (elválasztás: vessző) adatforrások\n"
+"                   feldolgozásának mellőzése\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - lehetővé teszi a csomagok függőség- és "
-"helyességellenőrzés\n"
-"                   nélküli telepítését (a felhasználótól érkező "
-"megerősítést\n"
-"                   követően)\n"
+"  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
+"                   sztringek alapján\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+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"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: egy RPM fájl nem olvasható: \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - részletes információ\n"
 
-#: ../urpm.pm:1
+# maximális sorhossz: 80 karakter (karakteres terminál sorhossza)
+# "." ne legyen a sztringek végén
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "a beállítások mentése nem sikerült: \"%s\""
+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,\n"
+"                   akkor ez lép életbe; interaktív módban nem használható)\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Érvénytelen kulcsazonosító (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - az összes adat megjelenítése\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - csoport megjelenítése\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - méret megjelenítése\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - kiterjesztett függőséglista keresése és felhasználása\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - generáció megjelenítése\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
-"                   urpmi-adatbázis helyett\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - összefoglaló megjelenítése\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - leírás megjelenítése\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<a fejléclista relatív útvonala> hiányzik\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - a forráscsomag megjelenítése\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ellenőrzés a következő csomagok eltávolításához"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - a csomagkészítő nevének megjelenítése\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "nem volt kérve"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - a csomagkészítéshez használt gép nevének megjelenítése\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "a csomagfájl nem elérhető: \"%s\""
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - URL megjelenítése\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - a fájlnevek megjelenítése (mindet)\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - szolgáltatásjegyzék megjelenítése (mindet)\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%s\" elemzése sikertelen a következő fájlban: \"%s\""
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - a követelmények megjelenítése (mindet)\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Szeretné folytatni a telepítést?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - a fájlnevek megjelenítése (mindet)\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "a(z) \"%s\" csomagfájl (RPM) nem olvasható a(z) \"%s\" adatforrásból"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - az ütközések megjelenítése (mindet)\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - az elavult csomagok megjelenítése (mindet)\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - megadott környezet használata (általában hibajelentés\n"
+"                   esetében)\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "kiterjesztett függőséglista készítése ehhez: \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - egyéb információk kiírása könnyen olvasható formában\n"
+"  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
+"                   architektúra is jelenjen meg\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - a megadott disztribúcióverzió használata - az\n"
-"                   alapértelmezés a telepített mandrake-release csomag "
-"által\n"
-"                   megadott verzió\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - a megadott URL által azonosított fájl használata\n"
-"                   tükörkiszolgáló-listaként; alapértelmezés:\n"
-"                   %s\n"
+"  -a             - bináris ÉS művelet: akkor igaz, ha mindkét kifejezés "
+"igaz\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - bináris VAGY művelet: akkor igaz, ha legalább\n"
+"                   az egyik kifejezés igaz\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - unáris NEM művelet: akkor igaz, ha a kifejezés hamis\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
+"  (              - zárójelpár nyitó része; kifejezések csoportosításához\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "unmounting %s"
-msgstr "%s leválasztása"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - zárójelpár záró része; kifejezések csoportosításához\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:114
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
-"felvételéhez)\n"
+"callback:\n"
+"%s\n"
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s %%; sebesség: %s"
+msgid "using specific environment on %s\n"
+msgstr "a következő környezet használata: %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi %s\n"
+"Copyright Š 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Mindenképpen megkíséreljem a telepítést (--force)? (i/N) "
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - a megadott kiterjesztett függőséglista használata az\n"
+"                   urpmi-adatbázis helyett\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "...copying failed"
-msgstr "...a másolás sikertelen"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:85
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
+"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
+"inkább\n"
+"                   szakadjon félbe a telepítés\n"
 
-#: ../urpmi:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - néma üzemmód\n"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - a már telepített csomagok megtartása, ha lehetséges - a\n"
+"                   törlést igénylő csomagok nem kerülnek telepítésre\n"
 
-#: ../urpmf:1
+#: ../urpmi:88
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - részletes információ\n"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - a műveletek több részre bontása a megadottnál több "
+"csomag\n"
+"                   telepítése vagy frissítése esetén,\n"
+"                   az alapértelmezés szerinti érték: %d\n"
 
-#: ../urpmq:1
+#: ../urpmi:91
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
-"  --sources      - a csomagok elérési útjának listázása letöltés előtt\n"
-"                   (rendszergazdai jogosultság szükséges)\n"
+"  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
+"d\n"
 
-#: ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - fuzzy keresés használata (-y opcióval azonos)\n"
+
+#: ../urpmi:93 ../urpmq:59
+#, c-format
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --headers      - a csomagok urpmi-adatbázisban tárolt fejléceinek kiírása\n"
-"                   a standard kimenetre (stdout) - a művelethez\n"
-"                   rendszergazdai jogosultság szükséges\n"
+"  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
 
-#: ../urpme:1
+#: ../urpmi:94
 #, c-format
-msgid "unknown packages"
-msgstr "ismeretlen csomagok"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "több adatforrás kijelölése: \"%s\""
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - RPM fájl eltávolítása a gyorstárból a műveletek előtt\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:96
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
-"  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
-"                   architektúra is jelenjen meg\n"
+"  --noclean      - a nem használt RPM fájlok maradjanak a gyorstárban\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "A(z) \"%s\" fájl már fel lett használva ugyanezen adatforráson: \"%s\""
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
+"                   telepítését (a felhasználótól érkező megerősítést "
+"követően)\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:100
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
-"felvételéhez)\n"
+"  --allow-force  - lehetővé teszi a csomagok függőség- és "
+"helyességellenőrzés\n"
+"                   nélküli telepítését (a felhasználótól érkező "
+"megerősítést\n"
+"                   követően)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - jelen segítség megjelenítése\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - a wget használata távoli fájlok letöltésére\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "párhuzamosság van definiálva a következő gépekre: %s"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
+
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"callback:\n"
-"%s\n"
+"  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
+"                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - fordított keresés: mi igényli a csomagot\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - a megadott HTTP proxy használata; a portszám "
+"alapértelmezés\n"
+"                   szerint 1080 (formátum: <proxygép[:port]>)\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf %s\n"
-"Copyright Š MandrakeSoft, 2002.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
+"  --proxy-user   - proxyhoz használandó felhasználónév és jelszó\n"
+"                   (formátum: <felhasználónév:jelszó>)\n"
 
-# maximális sorhossz: 80 karakter (karakteres terminál sorhossza)
-# "." ne legyen a sztringek végén
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - címke kiírásának elhagyása (ha nincs címke a "
-"parancssorban,\n"
-"                   akkor ez lép életbe; interaktív módban nem használható)\n"
+"  --bug          - hibajelentés írása a következő argumentumban megadott\n"
+"                   könyvtárba\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - futtatás az X grafikus felületen\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
-"--update, --parallel"
+"  --best-output  - a lehetőségek közül a legmegfelelőbb felületet\n"
+"                   használja a program: grafikus (X) vagy karakteres\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - a megadott architektúra használata - az alapértelmezés a\n"
-"                   telepített mandrake-release csomag által megadott\n"
-"                   architektúra\n"
+"  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
+"                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Így rendben van?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
+"  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - dokumentációs fájlok kihagyása\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-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"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "párhuzamosság vizsgálata a következő fájlban: \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nincs mit eltávolítani"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" adatforrás fejléceinek olvasása"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - a következő csomag egy forráscsomag (--src opcióval "
+"azonos)\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggőségekre is\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - néma üzemmód\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - hibajelentés írása a következő argumentumban megadott\n"
-"                   könyvtárba\n"
+"  a parancssorban megadott csomagok illetve RPM fájlok lesznek telepítve\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "a(z) \"%s\" adatforrás nem definiálja az RPM fájlok helyét"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - a forráscsomag megjelenítése\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Mit lehet tenni bináris RPM fájlokkal, ha --install-src van megadva"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "a(z) \"%s\" listafájlja nem írható"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - a követelmények megjelenítése (mindet)\n"
+msgid "Do nothing"
+msgstr "Ne tegyen semmit"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "kísérlet történt nem létező adatforrás (\"%s\") kiválasztására"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - leírás megjelenítése\n"
+msgid "Save file"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "A másolás sikertelen"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "A telepítés nem sikerült"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:239
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:240
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "a --list-nodes csak a --parallel opcióval használható"
+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\""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "a(z) \"%s\" adatforráshoz nem található fejléclista (hdlist)"
+msgid "Copying failed"
+msgstr "A másolás sikertelen"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:260
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - a következő csomag egy forráscsomag (--src opcióval "
-"azonos)\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi:1
+#: ../urpmi:396
 #, c-format
-msgid "installing %s"
-msgstr "%s telepítése folyik"
+msgid "One of the following packages is needed:"
+msgstr "A következő csomagok valamelyikére szükség van:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "csomagfájlok (RPM) olvasása innen: \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "Melyiket választja? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" leírásfájljának másolása..."
+msgid "Package installation..."
+msgstr "Csomagtelepítés..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Initializing..."
+msgstr "Inicializálás..."
+
+#: ../urpmi:435
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
+"A kért csomagok közül néhányat nem lehet telepíteni:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Az eltávolítás sikertelen"
+msgid "do you agree ?"
+msgstr "Rendben van így?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - virtuális, mindig naprakész adatforrás létrehozása,\n"
-"                   amelynél csak a file:// protokoll használható\n"
+"A telepítés nem folytatható, mert a következő csomagokat el kell\n"
+"távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "a csomag nem található: \"%s\""
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" adatforrás eltávolítása"
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"A függőségek feloldásához a következő csomagok telepítésre kerülnek (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"A következő függőségek telepítéséhez rendszergazdai jogosultság szükséges:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Mégsem"
+msgid "unable to get source packages, aborting"
+msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Helyezze be a(z) \"%s\" nevű adathordozót a(z) \"%s\" meghajtóba"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - megadott környezet használata (általában hibajelentés\n"
-"                   esetében)\n"
+msgid "Press Enter when ready..."
+msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
-"                   sztringek alapján\n"
+msgid "Downloading package `%s'..."
+msgstr "A(z) '%s' csomag letöltése folyik..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "a(z) \"%s\" adatforrás nem elérhető"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s %% ebből: %s; hátralevő: %s; sebesség: %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s %%; sebesség: %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - a csomagkészítő nevének megjelenítése\n"
+msgid "The following packages have bad signatures"
+msgstr "A következő csomagok helytelen aláírást tartalmaznak:"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "Do you want to continue installation ?"
+msgstr "Szeretné folytatni a telepítést?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"A következő függőségek telepítéséhez rendszergazdai jogosultság szükséges:\n"
+"A telepítés nem sikerült, mivel bizonyos fájlok hiányoznak:\n"
 "%s\n"
+"Érdemes lehet frissíteni az urpmi adatbázist."
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all          - az összes adat megjelenítése\n"
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "A telepítés nem sikerült"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgozásra"
+msgid "distributing %s"
+msgstr "%s elosztása"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - zárójelpár záró része; kifejezések csoportosításához\n"
+msgid "installing %s"
+msgstr "%s telepítése folyik"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "fejléclista vizsgálata: \"%s\""
+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) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "fejléclista másolása..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Mindenképpen megkíséreljem a telepítést (--force)? (i/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "a(z) \"%s\" adatforrás listafájljának írása"
+msgid "%d installation transactions failed"
+msgstr "%d telepítési művelet nem sikerült"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
-"adatforrás nem kerül feldolgozásra"
+msgid "Installation is possible"
+msgstr "A telepítés elvégezhető"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "Már minden telepítve van"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
 msgstr ""
-"  --buildhost    - a csomagkészítéshez használt gép nevének megjelenítése\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"Használat: urpmi.addmedia [opciók] <név> <URL> [with <relatív_útvonal>]\n"
+"ahol <URL> az alábbiak egyike lehet:\n"
+"       file://<elérési út>\n"
+"       ftp://<felhasználónév>:<jelszó>@<gépnév>/<elérési út> with <a "
+"fejléclista relatív fájlneve>\n"
+"       ftp://<gépnév>/<elérési út> with <a fejléclista relatív fájlneve>\n"
+"       http://<gépnév>/<elérési út> with <a fejléclista relatív fájlneve>\n"
+"       removable://<elérési út>\n"
+"\n"
+"az [opciók] pedig a következők lehetnek:\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "Ne tegyen semmit"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - frissítési adatforrás létrehozása\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - kiterjesztett függőséglista keresése és felhasználása\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "%s csatolása"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"a(z) \"%s\" adatforrás nem kezelhető, mivel a listafájlt már használja egy "
-"másik adatforrás"
+"  --no-probe     - fejléclista illetve kiterjesztett függőséglista\n"
+"                   keresésének mellőzése\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - a curl használata távoli fájlok letöltésére\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s %% ebből: %s; hátralevő: %s; sebesség: %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - adatforrás automatikus létrehozása egy disztribúció XXX\n"
+"                   részéhez; az XXX lehetséges értékei: main, contrib,\n"
+"                   updates, vagy bármi, ami be lett állítva\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"a letöltött forrás-fejléclista (vagy a kiterjesztett függőséglista) MD5-ös "
-"összegének kiszámítása folyik"
+"  --from         - a megadott URL által azonosított fájl használata\n"
+"                   tükörkiszolgáló-listaként; alapértelmezés:\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - a megadott disztribúcióverzió használata - az\n"
+"                   alapértelmezés a telepített mandrake-release csomag "
+"által\n"
+"                   megadott verzió\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
-"inkább\n"
-"                   szakadjon félbe a telepítés\n"
+"  --arch         - a megadott architektúra használata - az alapértelmezés a\n"
+"                   telepített mandrake-release csomag által megadott\n"
+"                   architektúra\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq %s\n"
-"Copyright Š 2000, 2001, 2002 MandrakeSoft.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
+"  --virtual      - virtuális, mindig naprakész adatforrás létrehozása,\n"
+"                   amelynél csak a file:// protokoll használható\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
-"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
-"behozatala..."
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "a(z) \"%s\" adatforrás nincs kijelölve"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - fejléclista-fájlok létrehozásának kikényszerítése\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "egy Cooker disztribúció frissítései nem vehetők fel\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "a következő környezet használata: %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "tükörkiszolgálók behozatala: %s..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"\"%s\" fejléclistája nem található; az adatforrás nem kerül feldolgozásra"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
-"  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
-"d\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - zárójelpár nyitó része; kifejezések csoportosításához\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<a fejléclista relatív útvonala> hiányzik\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "hiányzó 'with' paraméter a hálózati adatforrásnál\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - bináris ÉS művelet: akkor igaz, ha mindkét kifejezés "
-"igaz\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"A(z) \"%s\" adatforrás nem elérhető.\n"
-"Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
-"megfelelő könyvtár."
+"Használat: urpmi.removemedia [-a] <név> ...\n"
+"ahol <név> az eltávolítandó adatforrás neve.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - csoport megjelenítése\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - az összes adatforrás kijelölése\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
-"                   használata\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "egy művelet elvégzése nem sikerült"
+"\n"
+"ismeretlen opciók: \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM fájlok behozatala a(z) \"%s\" adatforrásból..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"a törlendő bejegyzés hiányzik\n"
+"(valamelyik ezek közül: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s elosztása"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Használat: urpmi.update [opciók] <név> ...\n"
+"ahol <név> a frissítendő adatforrás neve.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "A telepítés nem sikerült"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - csak frissítési adatforrás legyen frissítve\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "beállítások mentése: \"%s\""
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - az összes nem cserélhető adatforrás kijelölése\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - generáció megjelenítése\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
-"                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
+"a frissítendő bejegyzés hiányzik\n"
+"(valamelyik ezek közül: %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf %s\n"
+"Copyright Š MandrakeSoft, 2002.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, 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"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - frissítési adatforrás létrehozása\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - az elérhető adatforrások listázása\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - az elérhető adatforrások listázása\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "érvénytelen fejléclista-leírás a fejléclista-fájlban: \"%s\""
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "\"%s\" eltávolítása"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - a csomagok urpmi-adatbázisban tárolt fejléceinek kiírása\n"
+"                   a standard kimenetre (stdout) - a művelethez\n"
+"                   rendszergazdai jogosultság szükséges\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - adatforrás automatikus létrehozása egy disztribúció XXX\n"
-"                   részéhez; az XXX lehetséges értékei: main, contrib,\n"
-"                   updates, vagy bármi, ami be lett állítva\n"
+"  --sources      - a csomagok elérési útjának listázása letöltés előtt\n"
+"                   (rendszergazdai jogosultság szükséges)\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - méret megjelenítése\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "\"%s\" megtartása érdekében"
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all          - az összes adat megjelenítése\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "\"%s\" igényei miatt"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - a lekérdezés terjedjen ki a csomagfüggőségekre is\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"A csomagok automatikus telepítése...\n"
-"A(z) %s csomag telepítését kérte...\n"
+"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "az urpmi adatbázis zárolt"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (alapértelmezés:\n"
-"                   bekapcsolt állapot; kikapcsolás: --no-verify-rpm)\n"
+"  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - fordított keresés: mi igényli a csomagot\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
+"  -i             - egyéb információk kiírása könnyen olvasható formában\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a cserélhető eszköz a következőnek lesz véve: \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+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"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - fuzzy keresés használata (-y opcióval azonos)\n"
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - az elérhető csomagok listázása\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
+"  a parancssorban megadott csomagok illetve RPM fájlok lesznek lekérdezve\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - fejléclista keresése és felhasználása\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "a --list-nodes csak a --parallel opcióval használható"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "\"%s\" hiánya miatt"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "teljes adatforráslista nem található"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"Használat: urpmi.update [opciók] <név> ...\n"
-"ahol <név> a frissítendő adatforrás neve.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "a(z) \"%s\" néven létező adatforrás elkerülése"
+#~ 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:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - annak ellenőrzése, hogy a telepítés végrehajtható-e\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq %s\n"
+#~ "Copyright Š 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+#~ "\n"
+#~ "Használat:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Ismeretlen letöltőprogram: \"%s\".\n"
@@ -2228,9 +2274,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "további opciókért próbálja meg az \"urpmf --help\" parancsot"
 
-#~ msgid "no full media list was found"
-#~ msgstr "teljes adatforráslista nem található"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "\"%s\" forráslistájának másolása..."
 
diff --git a/po/id.po b/po/id.po
index 92585f23..3c412176 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-08-13 15:20+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -35,853 +35,767 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "TtNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalasi %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
+"Instalasi paket otomatis...\n"
+"Anda telah meminta instalasi paket %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "gagal buka rpmdb"
+msgid "Is this OK?"
+msgstr "Semua beres?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - cetak pesan pertolongan ini.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "paket %s sedang dihapus"
+msgid " (Y/n) "
+msgstr " (Y/t) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: perintah tak tercari\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "semua telah terinstal"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - cetak pesan pertolongan ini.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - cetak grup tag: grup.\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - daftar paket tersedia.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori cache header.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protokol tak dikenal didefinisikan untuk %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - cetak sediaan tag: semua sediaan.\n"
+msgid "unable to handle protocol: %s"
+msgstr "gagal menangani protokol: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "salah syntax dlm file konfigurasi baris %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "temukan %d header di cache"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "media \"%s\" mencoba memakai hdlist yg telah dipakai, media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "banyak paket dg nama file rpm sama \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - tentukan user dan katakunci utk otentikasi proxy\n"
-"                   (dg format <user:katakunci>).\n"
+"gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "pembilasan kedua untuk menghitung ketergantungan\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ambil file rpm [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - daftar alias paralel.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "gagal tentukan media file hdlist [%s] ini"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gagal periksa file daftar \"%s\", media diabaikan"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "gagal mengakses file list \"%s\", media diabaikan"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operator OR biner, benar jika salah satu ekspresi benar.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "coba bypass media \"%s\", abaikan"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Instalasi paket..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"media maya \"%s\" tak boleh menentukan file list/hdlist, media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nama file rpm [%s] tak berlaku"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "media maya \"%s\" harus punya url jelas, media diabaikan"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "deklarasi proxy buruk di baris perintah\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "transaksi instalasi %d gagal"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "gagal cari file daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"gagal mengakses media instalasi pertama (file Mandrake/base/hdlists tak "
-"ditemukan)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "file list \"%s\" tak koheren, media diabaikan"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, coba lagi\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gagal periksa file daftar \"%s\", media diabaikan"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - cetak ringkasan tag: ringkasan.\n"
+msgid "taking removable device as \"%s\""
+msgstr "ambil perangkat removable sbg \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Paket berikut berisi %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalasi gagal"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pakai removable device lain [%s] untuk \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - pakai antarmuka X.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "tak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Salah satu paket berikut dibutuhkan:"
+msgid "unable to write config file [%s]"
+msgstr "gagal tulis file konfigurasi [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Paket berikut akan dihapus agar syarat ketergantungan terpenuhi (%d MB)"
+msgid "write config file [%s]"
+msgstr "tulis file konfigurasi [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - pilih antarmuka terbaik menurut lingkungan:\n"
-"                   X atau mode teks.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Ambil paket `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "gagal menelaah \"%s\" di file [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Apa yg dapat dilakukan dg file rpm biner saat menggunakan --install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "pemeriksaan handler paralel di file [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "ditemukan handler paralel utk node: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "tiada paket bernama %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "gunakan media terkait utk mode paralel: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "gagal menggunakan opsi paralel \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Instalasi gagal, beberapa file hilanga.\n"
-"%s\n"
-"Anda mungkin perlu meng-update database urpmi"
+"--synthesis tak dapat dipakai dg --media, --excludemedia, --sortmedia, --"
+"update atau --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"pemakaian: urpmi.removemedia [-a] <nama> ...\n"
-"<nama> adalah nama media yg akan dihapus.\n"
+msgid "examining synthesis file [%s]"
+msgstr "periksa file sintesa [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalasi tak dapat dilanjutkan sebab paket berikut harus dihapus\n"
-"agar yang lain dapat di-upgrade:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "periksa baca file hdlist [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' tak tercantum utk media jaringan\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - daftar paket tersedia.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "media maya \"%s\" bukan lokal, media diabaikan"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "paket tak dikenal"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "masalah dalam membaca file sintesa/hdlist media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalasi dimungkinkan"
+msgid "performing second pass to compute dependencies\n"
+msgstr "pembilasan kedua untuk menghitung ketergantungan\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "lewatkan paket %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "paket %s akan diinstal, bukan diupgrade"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "media \"%s\" tak terpakai karena file daftar [%s] tak ada"
+msgid "unable to open rpmdb"
+msgstr "gagal buka rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/T) "
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" telah ada"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "gagal menambahkan update distribusi cooker\n"
+msgid "virtual medium need to be local"
+msgstr "media maya (virtual) harus lokal"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mode detil.\n"
+msgid "added medium %s"
+msgstr "media %s ditambahkan"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inisialisasi..."
+msgid "unable to access first installation medium"
+msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - daftar paket tersedia.\n"
+msgid "copying hdlists file..."
+msgstr "sedang menyalin file hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - cetak semua tag.\n"
+msgid "...copying failed"
+msgstr "...copy gagal"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
+msgid "...copying done"
+msgstr "copy selesai"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"media maya \"%s\" tak boleh menentukan file list/hdlist, media diabaikan"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "sedang menghitung md5sum hdlist/sintesa source tersalin"
+"gagal mengakses media instalasi pertama (file Mandrake/base/hdlists tak "
+"ditemukan)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - path pengecualian, dipisah oleh koma.\n"
+msgid "retrieving hdlists file..."
+msgstr "ambil file hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Tekan [Enter] jika siap.."
+msgid "...retrieving done"
+msgstr "pengambilan selesai"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opsi tak dikenal '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - split jadi transaksi kecil jika paket yg akan diinstal /\n"
-"                   upgrade lebih banyak daripada yg diberikan,\n"
-"                   standarnya %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "masalah dalam membaca file sintesa/hdlist media \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "sedang mencoba memilih media tak eksis \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
+msgid "selecting multiple media: %s"
+msgstr "memilih media majemuk: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bangun hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"akses media \"%s\" gagal,\n"
+"ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
+"media."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - sebisa mungkin menjaga paket, tolak permintaan paket yg\n"
-"                   bisa menghapus paket yg sudah ada.\n"
+"media maya \"%s\" harus punya source hdlist/sintesa yg valid, media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "periksa file MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: perintah tak tercari\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "sedang menghitung md5sum hdlist source (atau sintesa)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "registrasi file rpm gagal"
+msgid "examining MD5SUM file"
+msgstr "periksa file MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - izinkan meminta user utk menginstal paket tanpa\n"
-"                   mencek ketergantungan.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "gagal menangani protokol: %s"
+#: ../urpm.pm:1105
+#, fuzzy, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "wget [%s] gagal (mungkin wget hilang?)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "ambil file hdlist..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "sedang menghitung md5sum hdlist/sintesa source tersalin"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "gagal salin [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "media %s ditambahkan"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "sulit membaca file sintesa hdlist utk media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - jaga rpm tak dipakai di cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "baca file rpm dari [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transaksi utk instalasi di %s (hapus=%d, instal=%d, upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "gagal baca file rpm dari [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum tak cocok"
+msgid "no rpm files found from [%s]"
+msgstr "tiada file rpm tertemukan dari [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "salah syntax dlm file konfigurasi baris %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nama atau file rpm yg tertera pada baris perintah akan diinstal.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "ditemukan hdlist (atau sintesa) terselidik sbg %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - gunakan proksi HTTP tertentu, nomor port dianggap\n"
-"                   1080 secara standar (dg format <hostproxy[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "hitung md5sum hdlist source (atau sintesa) yg diambil"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "utk instalasi %s"
+msgid "md5sum mismatch"
+msgstr "md5sum tak cocok"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entri di depslist direlokasikan"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "gagal mengambil hdlist (atau sintesa) source"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - abaikan perbedaan huruf besar/kecil dlm tiap pola.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "gagal membuat direktori [%s] untuk laporan kutu"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "paket %s akan diinstal, bukan diupgrade"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "gagal olah file hdlist \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "ambil mirror di %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "gagal baca file list \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - cetak tag url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "penulisan file list media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokol tak dikenal didefinisikan untuk %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "tak ada yg ditulis dlm file daftar \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - juga cetak versi dan release dg nama.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "periksa file pubkey \"%s\"..."
 
-#: ../urpmf:1
-#, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - cetak kadaluarsa tag: semua kadaluarsa.\n"
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "gagal impor file pubkey \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" telah ada"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "gagal impor file pubkey \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instalasi %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "baca header dari media \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"masukan update hilang\n"
-"(satu dari %s)\n"
+msgid "building hdlist [%s]"
+msgstr "bangun hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "promosikan %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bangun file sintesa hdlist utk media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paket %s tak dapat dihapus"
+msgid "found %d headers in cache"
+msgstr "temukan %d header di cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "sulit membaca file sintesa hdlist utk media \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "hapus %d header kadaluarsa dlm cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"masukan utk penghapusan hilang\n"
-"(satu dari %s)\n"
+msgid "mounting %s"
+msgstr "gandeng %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - pilih semua media.\n"
+msgid "unmounting %s"
+msgstr "lepas mount %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Tanda tangan hilang (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "%s entri di depslist direlokasikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "gagal baca file rpm dari [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "tiada entri di depslist direlokasikan"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "wget [%s] gagal (mungkin wget hilang?)"
+msgid "invalid rpm file name [%s]"
+msgstr "nama file rpm [%s] tak berlaku"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - update hanya media update.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "ambil file rpm [%s] ..."
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/t) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - cetak grup tag: grup.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "gagal akses file rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
+msgid "unable to register rpm file"
+msgstr "registrasi file rpm gagal"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input cacat: [%s]"
+msgid "error registering local packages"
+msgstr "salah registrasi paket lokal"
 
-#: ../urpme:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "sistem akan rusak jika paket %s dihapus"
+msgid "no package named %s"
+msgstr "tiada paket bernama %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - daftar media tersedia.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Paket berikut berisi %s: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Beberapa paket tak dapat diinstal:\n"
-"%s"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak paket dg nama file rpm sama \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalasi paket `%s' (%s/%s)..."
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "tiada entri di depslist direlokasikan"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"media \"%s\" menggunakan file daftar yg tak berlaku:\n"
+"  mirror mungkin tak up-to-date, coba gunakan metode alternatif"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instal hanya paket source (tanpa kode biner).\n"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "media \"%s\" tak mendefinisikan lokasi file rpm"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
+msgid "package %s is not found."
+msgstr "paket %s tak tertemukan."
 
-#: ../urpmf:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cakup kode perl secara langsung sbg perl -e.\n"
+msgid "urpmi database locked"
+msgstr "database urpmi terkunci"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "do you agree ?"
-msgstr "setuju ?"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" tak dipilih"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "file list \"%s\" tak koheren, media diabaikan"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca file rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "...retrieving done"
-msgstr "pengambilan selesai"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "media nonkoheren \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "tambah paket %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "unable to access medium \"%s\""
+msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "skipping package %s"
-msgstr "lewatkan paket %s"
+msgid "malformed input: [%s]"
+msgstr "input cacat: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Tanda tangan tak berlaku (%s)"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "ambil file rpm dari media \"%s\"..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
+msgid "Preparing..."
+msgstr "Persiapan..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2752
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "using process %d for executing transaction"
 msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "gagal olah dg benar [%s] pada nilai \"%s\""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - jangan pakai media yg diberikan (pisahkan dg koma).\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "transaksi utk instalasi di %s (hapus=%d, instal=%d, upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "gagal tentukan media file hdlist [%s] ini"
+msgid "unable to create transaction"
+msgstr "gagal membuat transaksi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "gagal olah file hdlist \"%s\""
+msgid "removing package %s"
+msgstr "paket %s sedang dihapus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "media \"%s\" mencoba memakai hdlist yg telah dipakai, media diabaikan"
+msgid "unable to remove package %s"
+msgstr "paket %s tak dapat dihapus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "karena konflik dg %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "tambah paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "hapus %d header kadaluarsa dlm cache"
+msgid "unable to install package %s"
+msgstr "gagal menginstal paket %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "gagal update media \"%s\"\n"
+msgid "due to missing %s"
+msgstr "karena %s hilang"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
+msgid "due to unsatisfied %s"
+msgstr "karena %s tak dipenuhi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "media maya \"%s\" bukan lokal, media diabaikan"
+msgid "trying to promote %s"
+msgstr "promosikan %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Persiapan..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - daftar paket tersedia.\n"
+msgid "in order to keep %s"
+msgstr "utk menjaga %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable device lain [%s] untuk \"%s\""
+msgid "in order to install %s"
+msgstr "utk instalasi %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - jangan coba cari file hdlist / sintesa.\n"
-"\n"
+msgid "due to conflicts with %s"
+msgstr "karena konflik dg %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "gagal salin [%s]"
+msgid "unrequested"
+msgstr "tak diminta"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Tanda tangan tak berlaku (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Kunci ID Tak Berlaku (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
+msgid "Missing signature (%s)"
+msgstr "Tanda tangan hilang (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" telah dipakai, tak dapat digunakan utk media tak bernama"
+msgid "bad proxy declaration on command line\n"
+msgstr "deklarasi proxy buruk di baris perintah\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - cetak konflik tag: semua konflik.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"media maya \"%s\" harus punya source hdlist/sintesa yg valid, media diabaikan"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, coba lagi\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -897,638 +811,683 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - cetak pesan pertolongan ini.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"pemakaian: urpmi.addmedia [opsi] <nama> <url> [with <path_relatif>]\n"
-"keterangan: <url> adalah\n"
-"       file://<path>\n"
-"       ftp://<login>:<sandi>@<host>/<path> with <namafile relatif hdlist>\n"
-"       ftp://<host>/<path> with <namafile relatif hdlist>\n"
-"       http://<host>/<path> with <namafile relatif hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"dan [opsi] dari\n"
+"  --test         - verifikasi apakah instalasi dapat dilaksanakan dg benar.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "sedang menyalin sumber/sintesa hdlist \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "copy selesai"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "gagal menggunakan opsi paralel \"%s\""
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"media \"%s\" menggunakan file daftar yg tak berlaku:\n"
-"  mirror mungkin tak up-to-date, coba gunakan metode alternatif"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "gagal mengakses media instalasi pertama"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mode detil.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "media maya (virtual) harus lokal"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - pilih semua paket yg cocok dg ekspresi.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "salah registrasi paket lokal"
+msgid "unknown packages"
+msgstr "paket tak dikenal"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - batasi laju download.\n"
+msgid "unknown package"
+msgstr "paket tak dikenal"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "ditemukan hdlist (atau sintesa) terselidik sbg %s"
+msgid "removing package %s will break your system"
+msgstr "sistem akan rusak jika paket %s dihapus"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "gagal mengambil hdlist (atau sintesa) source"
+msgid "Nothing to remove"
+msgstr "Tiada yang dihapus"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "tiada file rpm tertemukan dari [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Cek penghapusan paket berikut"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "tak ada yg ditulis dlm file daftar \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Paket berikut akan dihapus agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Paket berikut berisi tandatangan tak benar"
+msgid " (y/N) "
+msgstr " (y/T) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "sedang menghitung md5sum hdlist source (atau sintesa)"
+msgid "removing %s"
+msgstr "hapus %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - keluaran lengkap dg paket yg akan dihapus.\n"
+msgid "Removing failed"
+msgstr "Gagal dihapus"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versi %s\n"
+"Hakcipta (C) 2002 MandrakeSoft.\n"
+"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"\n"
+"pemakaian:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "gagal menginstal paket %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - pakai hanya media update.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - pakai hanya media yg diberikan, dipisahkan koma.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - jangan pakai media yg diberikan (pisahkan dg koma).\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - izinkan meminta user menginstal paket tanpa\n"
-"                   mencek ketergantungan dan integritas.\n"
+"  --sortmedia    - sortir media menurut substring yg dipisahkan dg koma.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode detil.\n"
+
+#: ../urpmf:39
+#, c-format
+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\n"
+"                   perintah, tak kompatibel dg mode interaktif).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tak dapat membaca file rpm \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - jangan cetak baris identik.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "gagal tulis file konfigurasi [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - cetak semua tag.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - pilih semua paket yg cocok dg ekspresi.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - cetak grup tag: grup.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Kunci ID Tak Berlaku (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - paksa instal meski bbrp paket tak ada.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - cetak ukuran tag: ukuran.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tak dapat mengambil nama path utk media removable \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - cetak ringkasan tag: ringkasan.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - coba cari dan gunakan file sintesa.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - cetak penjelasan tag: penjelasan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - cetak sourcerpm tag: rpm source.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - cetak pemaket tag: pemaket.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<path relatif hdlist> hilang\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - cetak buildhost tag: host pembangun.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Cek penghapusan paket berikut"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - cetak tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "tak diminta"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - cetak sediaan tag: semua sediaan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "gagal akses file rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - cetak kebutuhan tag: semua kebutuhan.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - cetak file tag: semua file.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "gagal menelaah \"%s\" di file [%s]"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - cetak konflik tag: semua konflik.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Teruskan instalasi ?"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - cetak kadaluarsa tag: semua kadaluarsa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca file rpm [%s] dari media \"%s\""
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\n"
 
-#: ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
+"  -i             - abaikan perbedaan huruf besar/kecil dlm tiap pola.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bangun file sintesa hdlist utk media \"%s\""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - cetak info penting dalam format yg dapat dibaca.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - pakai versi distribusi yg ditentukan, standarnya diambil\n"
-"                   dari versi distribusi paket mandrake-release terinstal.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - cakup kode perl secara langsung sbg perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - gunakan url yg ditunjuk utk daftar mirror, aslinya\n"
-"                   %s\n"
+"  -a             - operator AND biner, benar jika kedua ekspresi benar.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - operator OR biner, benar jika salah satu ekspresi benar.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT uner, benar jika ekspresi = salah.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "lepas mount %s"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - tanda kurung kiri utk membuka ekspresi grup.\n"
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% selesai, kecepatan = %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - tanda kurung kanan utk menutup ekspresi grup.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
+"callback adalah :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "periksa file sintesa [%s]"
+msgid "using specific environment on %s\n"
+msgstr "gunakan lingkungan spesifik di %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Coba instalasi lebih keras (--force)? (y/T) "
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "...copying failed"
-msgstr "...copy gagal"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini software gratis dan boleh disebar sesuai lisensi publik GNU.\n"
+"\n"
+"pemakaian:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mode diam.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - otomatis menyeleksi paket utk upgrade sistem.\n"
 
-#: ../urpmf:1
+#: ../urpmi:85
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode detil.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - jangan tanya uninstal paket, batalkan instalasi.\n"
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - beri semua paket source sebelum download (hanya only).\n"
+"  --keep         - sebisa mungkin menjaga paket, tolak permintaan paket yg\n"
+"                   bisa menghapus paket yg sudah ada.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
-"                   stdout (hanya root).\n"
-
-#: ../urpme:1
-#, c-format
-msgid "unknown packages"
-msgstr "paket tak dikenal"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "selecting multiple media: %s"
-msgstr "memilih media majemuk: %s"
+"  --split-level  - split jadi transaksi kecil jika paket yg akan diinstal /\n"
+"                   upgrade lebih banyak daripada yg diberikan,\n"
+"                   standarnya %d.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:91
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, release dan arch dg nama.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - panjang transaksi kecil, standarnya %d.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file [%s] telah dipakai dalam media yang sama \"%s\""
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "gagal cari file daftar \"%s\", media diabaikan"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instal hanya paket source (tanpa kode biner).\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:95
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - cetak pesan pertolongan ini.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "ditemukan handler paralel utk node: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - jaga rpm tak dipakai di cache.\n"
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"callback adalah :\n"
-"%s\n"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - apa yg memerlukan paket ini.\n"
+"  --allow-nodeps - izinkan meminta user utk menginstal paket tanpa\n"
+"                   mencek ketergantungan.\n"
 
-#: ../urpmf:1
+#: ../urpmi:100
 #, 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"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"urpmf versi %s\n"
-"Hakcipta (C) 2002 MandrakeSoft.\n"
-"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
-"\n"
-"pemakaian:\n"
+"  --allow-force  - izinkan meminta user menginstal paket tanpa\n"
+"                   mencek ketergantungan dan integritas.\n"
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"  --quiet        - jangan cetak nama tag (standar jika tiada tag pada baris\n"
-"                   perintah, tak kompatibel dg mode interaktif).\n"
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - jangan cetak baris identik.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - pakai wget utk mengambil file jauh.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr ""
-"--synthesis tak dapat dipakai dg --media, --excludemedia, --sortmedia, --"
-"update atau --parallel"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - batasi laju download.\n"
+
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --arch         - pakai arsitektur yg ditentukan, standarnya adalah\n"
-"                   arsitektur paket mandrake-release terinstal.\n"
-
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Semua beres?"
+"  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
+"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
 
-#: ../urpmi:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
+"  --proxy        - gunakan proksi HTTP tertentu, nomor port dianggap\n"
+"                   1080 secara standar (dg format <hostproxy[:port]>).\n"
 
-#: ../urpmf:1 ../urpmq:1
-#, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - gunakan synthesis yang diberikan, bukan db urpmi.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "pemeriksaan handler paralel di file [%s]"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - tentukan user dan katakunci utk otentikasi proxy\n"
+"                   (dg format <user:katakunci>).\n"
 
-#: ../urpme:1
+#: ../urpmi:115
 #, c-format
-msgid "Nothing to remove"
-msgstr "Tiada yang dihapus"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "gagal impor file pubkey \"%s\""
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug          - keluarkan laporan bug ke direktori yg ditentukan oleh\n"
+"                   arg. berikut.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "baca header dari media \"%s\""
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - pakai antarmuka X.\n"
 
-#: ../urpmq:1
+#: ../urpmi:120
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - pilih antarmuka terbaik menurut lingkungan:\n"
+"                   X atau mode teks.\n"
 
-#: ../urpmi:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --bug          - keluarkan laporan bug ke direktori yg ditentukan oleh\n"
-"                   arg. berikut.\n"
+"  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
+"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "media \"%s\" tak mendefinisikan lokasi file rpm"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - path pengecualian, dipisah oleh koma.\n"
 
-#: ../urpmf:1
+#: ../urpmi:126
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - cetak sourcerpm tag: rpm source.\n"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "gagal baca file list \"%s\""
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - pilih semua yg cocok dg baris perintah.\n"
 
-#: ../urpmf:1
+#: ../urpmi:128
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - cetak kebutuhan tag: semua kebutuhan.\n"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - izinkan search di provides utk mencari paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "sedang mencoba memilih media tak eksis \"%s\""
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - jangan cari di provides utk mencari paket.\n"
 
-#: ../urpmf:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - cetak penjelasan tag: penjelasan.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "Copying failed"
-msgstr "Copy gagal"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - paket berikut adalah paket sumber (sama dg --src).\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:132
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa buat file hdlist.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mode diam.\n"
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes hanya dapat dipakai dg --parallel"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nama atau file rpm yg tertera pada baris perintah akan diinstal.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "file hdlist utk media \"%s\" tak ditemukan"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:197
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  -s             - paket berikut adalah paket sumber (sama dg --src).\n"
+"Apa yg dapat dilakukan dg file rpm biner saat menggunakan --install-src"
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
-msgid "installing %s"
-msgstr "instalasi %s"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "baca file rpm dari [%s]"
+msgid "Do nothing"
+msgstr "Menganggur"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "file deskripsi \"%s\" sedang disalin"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
+msgid "Save file"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:225
 #, c-format
-msgid "Removing failed"
-msgstr "Gagal dihapus"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Instalasi gagal"
+
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  --virtual      - buat media maya yg selalu up-to-date,\n"
-"                   hanya protokol file:// yg diizinkan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "paket %s tak tertemukan."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "gagal membuat direktori [%s] untuk laporan kutu"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "hapus media \"%s\""
+msgid "Copying failed"
+msgstr "Copy gagal"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "tak perlu memberikan <path relatif hdlist> dg --distrib"
+msgid "Only superuser is allowed to install packages"
+msgstr "Hanya superuser yang boleh meng-instal paket"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "One of the following packages is needed:"
+msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - paket berikut adalah paket sumber (sama dg -s).\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - gunakan lingkungan khusus (umumnya laporan kutu).\n"
+msgid "Package installation..."
+msgstr "Instalasi paket..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Inisialisasi..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --sortmedia    - sortir media menurut substring yg dipisahkan dg koma.\n"
+"Beberapa paket tak dapat diinstal:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
+msgid "do you agree ?"
+msgstr "setuju ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "gagal membuat media \"%s\"\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Instalasi tak dapat dilanjutkan sebab paket berikut harus dihapus\n"
+"agar yang lain dapat di-upgrade:\n"
+"%s\n"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - cetak pemaket tag: pemaket.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Paket berikut harus dihapus agar yang lain dapat di-upgrade:\n"
+"%s"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1537,367 +1496,417 @@ msgstr ""
 "Anda perlu jadi root untuk menginstal ketergantungan berikut:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all          - cetak semua tag.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "gagal mengakses file list \"%s\", media diabaikan"
+msgid "unable to get source packages, aborting"
+msgstr "tak dapat mengambil paket asal, batal"
 
-#: ../urpmf:1
+#: ../urpmi:540
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - tanda kurung kanan utk menutup ekspresi grup.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" ke perangkat [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Press Enter when ready..."
+msgstr "Tekan [Enter] jika siap.."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "periksa baca file hdlist [%s]"
+msgid "Downloading package `%s'..."
+msgstr "Ambil paket `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "copying hdlists file..."
-msgstr "sedang menyalin file hdlist..."
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% dari %s selesai, perkiraan waktu tiba = %s, laju = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "penulisan file list media \"%s\""
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% selesai, kecepatan = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "media maya \"%s\" harus punya url jelas, media diabaikan"
+msgid "The following packages have bad signatures"
+msgstr "Paket berikut berisi tandatangan tak benar"
 
-#: ../urpmf:1
+#: ../urpmi:620
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - cetak buildhost tag: host pembangun.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Teruskan instalasi ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "Do nothing"
-msgstr "Menganggur"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalasi gagal, beberapa file hilanga.\n"
+"%s\n"
+"Anda mungkin perlu meng-update database urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "gunakan media terkait utk mode paralel: %s"
+msgid "Installation failed"
+msgstr "Instalasi gagal"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "mounting %s"
-msgstr "gandeng %s"
+msgid "distributing %s"
+msgstr "sebarkan %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"gagal pakai media \"%s\" sbg file list karena telah dipakai oleh media lain"
+msgid "installing %s"
+msgstr "instalasi %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:688
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "tak dapat mengambil paket asal, batal"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalasi paket `%s' (%s/%s)..."
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - pakai curl utk mengambil file jauh.\n"
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
 
-#: ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% dari %s selesai, perkiraan waktu tiba = %s, laju = %s"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Coba instalasi lebih keras (--force)? (y/T) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "hitung md5sum hdlist source (atau sintesa) yg diambil"
+msgid "%d installation transactions failed"
+msgstr "transaksi instalasi %d gagal"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "gagal impor file pubkey \"%s\""
+msgid "Installation is possible"
+msgstr "Instalasi dimungkinkan"
 
-#: ../urpmi:1
+#: ../urpmi:783
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - jangan tanya uninstal paket, batalkan instalasi.\n"
+msgid "Everything already installed"
+msgstr "semua telah terinstal"
 
-#: ../urpmq:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"pemakaian: urpmi.addmedia [opsi] <nama> <url> [with <path_relatif>]\n"
+"keterangan: <url> adalah\n"
+"       file://<path>\n"
+"       ftp://<login>:<sandi>@<host>/<path> with <namafile relatif hdlist>\n"
+"       ftp://<host>/<path> with <namafile relatif hdlist>\n"
+"       http://<host>/<path> with <namafile relatif hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "ambil hdlist source (atau sintesa) \"%s\"..."
+"dan [opsi] dari\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - cetak grup dg nama juga.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - buat media update.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" tak dipilih"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - coba cari dan gunakan file sintesa.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Hanya superuser yang boleh meng-instal paket"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - coba cari dan gunakan file hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "gunakan lingkungan spesifik di %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - jangan coba cari file hdlist / sintesa.\n"
+"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "gagal temukan file hdlist \"%s\", media diabaikan"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - buat semua media dari media instalasi dg otomatis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - panjang transaksi kecil, standarnya %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automatis membuat media utk bagian XXX distribusi,\n"
+"                   XXX dapat berupa main, contrib, updates atau apa saja\n"
+"                   yg telah dikonfigurasikan ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - tanda kurung kiri utk membuka ekspresi grup.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - gunakan url yg ditunjuk utk daftar mirror, aslinya\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - pakai versi distribusi yg ditentukan, standarnya diambil\n"
+"                   dari versi distribusi paket mandrake-release terinstal.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - operator AND biner, benar jika kedua ekspresi benar.\n"
+"  --arch         - pakai arsitektur yg ditentukan, standarnya adalah\n"
+"                   arsitektur paket mandrake-release terinstal.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"akses media \"%s\" gagal,\n"
-"ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
-"media."
+"  --virtual      - buat media maya yg selalu up-to-date,\n"
+"                   hanya protokol file:// yg diizinkan.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - cetak grup tag: grup.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - pakai hanya media yg diberikan, dipisahkan koma.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - bersihkan direktori cache header.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "gagal membuat transaksi"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa buat file hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "ambil file rpm dari media \"%s\"..."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "gagal menambahkan update distribusi cooker\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+msgid "retrieving mirrors at %s ..."
+msgstr "ambil mirror di %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "sebarkan %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "tak perlu memberikan <path relatif hdlist> dg --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+msgid "unable to update medium \"%s\"\n"
+msgstr "gagal update media \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "tulis file konfigurasi [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - pilih semua media non-removable.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' tak tercantum utk media jaringan\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "gagal membuat media \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
-"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
+"pemakaian: urpmi.removemedia [-a] <nama> ...\n"
+"<nama> adalah nama media yg akan dihapus.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" ke perangkat [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - daftar media tersedia.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opsi tak dikenal '%s'\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada penghapusan (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"masukan utk penghapusan hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskripsi hdlist \"%s\" di file hdlist tak berlaku"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"pemakaian: urpmi.update [opsi] <nama> ...\n"
+"<nama> adalah media yg akan di-update.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "removing %s"
-msgstr "hapus %s"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - update hanya media update.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:40
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
-"  --distrib-XXX  - automatis membuat media utk bagian XXX distribusi,\n"
-"                   XXX dapat berupa main, contrib, updates atau apa saja\n"
-"                   yg telah dikonfigurasikan ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - cetak ukuran tag: ukuran.\n"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "in order to keep %s"
-msgstr "utk menjaga %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "tak ada update (pakailah urpmi.addmedia utk tambah media)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:75
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "karena %s tak dipenuhi"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"masukan update hilang\n"
+"(satu dari %s)\n"
 
-#: ../_irpm:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"Instalasi paket otomatis...\n"
-"Anda telah meminta instalasi paket %s\n"
+"urpmf versi %s\n"
+"Hakcipta (C) 2002 MandrakeSoft.\n"
+"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"\n"
+"pemakaian:\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "urpmi database locked"
-msgstr "database urpmi terkunci"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - daftar paket tersedia.\n"
+
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - daftar media tersedia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:55
 #, fuzzy, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - daftar media tersedia.\n"
+
+#: ../urpmq:56
+#, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  --verify-rpm   - verifikasi tandatangan rpm sebelum instalasi.\n"
-"                   (nonaktif dg --no-verify-rpm, default adalah aktif).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "periksa file pubkey \"%s\"..."
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - daftar node tersedia saat menggunakan --parallel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:58
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - daftar alias paralel.\n"
+
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - keluarkan header packet terdaftar dari dalam db urpmi ke\n"
+"                   stdout (hanya root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil perangkat removable sbg \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua paket source sebelum download (hanya only).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all          - cetak semua tag.\n"
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tambah pencarian ke ketergantungan paket.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1905,41 +1914,77 @@ msgid ""
 msgstr ""
 "  -u             - hapus paket jika versi yg lebih baru telah terinstal.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - coba cari dan gunakan file hdlist.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - keluaran lengkap dg paket yg akan dihapus.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "karena %s hilang"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - apa yg memerlukan paket ini.\n"
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - cetak info penting dalam format yg dapat dibaca.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - pakai hanya media update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - cetak grup dg nama juga.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"pemakaian: urpmi.update [opsi] <nama> ...\n"
-"<nama> adalah media yg akan di-update.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - juga cetak versi dan release dg nama.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - daftar paket tersedia.\n"
+
+#: ../urpmq:90
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "coba bypass media \"%s\", abaikan"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes hanya dapat dipakai dg --parallel"
+
+#: ../urpmq:327
+#, c-format
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test         - verifikasi apakah instalasi dapat dilaksanakan dg benar.\n"
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "tak ditemukan daftar media lengkap"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Webfetch tak dikenal `%s' !!!\n"
@@ -2099,9 +2144,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "coba urpmf --help utk opsi lain"
 
-#~ msgid "no full media list was found"
-#~ msgstr "tak ditemukan daftar media lengkap"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "penyalinan daftar sumber \"%s\"..."
 
diff --git a/po/is.po b/po/is.po
index 5c3ef29a..94b766d1 100644
--- a/po/is.po
+++ b/po/is.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-02 23:43+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -37,812 +37,753 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+msgid "installing %s\n"
+msgstr "Set inn %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "gat ekki opnað rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - prenta þetta.\n"
+msgid "Is this OK?"
+msgstr "Er það í lagi?"
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Eins af eftirtöldum pökkum er þörf til að setja inn %s:"
+msgid "Ok"
+msgstr "Í lagi"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
-msgstr "fjarlægi pakka %s"
+msgid "Cancel"
+msgstr "Hætta við"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Everything already installed"
-msgstr "Allt er nú þegar komið inn"
-
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - hreinsa hausa möppu.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "using process %d for executing transaction"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - prenta hvað tag skaffar: allt sem er skaffað.\n"
-
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hvað viltu? (1-%d) "
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - prenta þetta.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "found %d headers in cache"
-msgstr "Fann %d hausa á biðsvæði"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "það eru margir pakkar með sama rpm skráaarnafn \"%s\""
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - lista skrár í pakka.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:57
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "unknown protocol defined for %s"
 msgstr ""
-"  --proxy-user   - skilgreindu sel-notanda og lykilorð til að nota til\n"
-"                   að auðkenna (snið er <user:password>).\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "Fer yfir í annað sinn til að athuga hvað er háð\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "sæki rpm skrá [%s] ..."
+msgid "unable to handle protocol: %s"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:174
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mistókst að sækja: %s"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gat ekki kannað skráarlista fyrir \"%s\", miðill hunsaður"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:202
 #, c-format
-msgid "Package installation..."
-msgstr "Pakka innsetning..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d Innsetningarfærslur brugðust"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Slæmt val.  Reyndu aftur\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Choose location to save file"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:262
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:271
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Eftirfarandi pakkar innihalda %s: %s"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Install it"
-msgstr "Setja það inn"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gat ekki kannað skráarlista fyrir \"%s\", miðill hunsaður"
 
-#: ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
-"Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar fjarlægðir (%d "
-"MB)"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Downloading package `%s'..."
-msgstr "Sæki pakka `%s'..."
-
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no package named %s"
-msgstr "Enginn '%s' pakki"
-
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:368
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:423
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista skrár í pakka.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:437
 #, c-format
-msgid "unknown package"
-msgstr "Óþekktur pakki"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid "Installation is possible"
-msgstr "Innsetning er möguleg"
+msgid "unable to use parallel option \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
-"%s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
+#, c-format
+msgid "examining synthesis file [%s]"
 msgstr ""
-"Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
-"MB)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ítarlegri hamur.\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "Fer yfir í annað sinn til að athuga hvað er háð\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Initializing..."
-msgstr "Frumstilli..."
+msgid "skipping package %s"
+msgstr "sleppi pakka %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:572
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "unable to open rpmdb"
+msgstr "gat ekki opnað rpmdb"
+
+#: ../urpm.pm:622
+#, c-format
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:629
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:661
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:677
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Sláðu á ENTER þegar tilbúinn..."
+msgid "...copying failed"
+msgstr "...afritun brást"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...niðurhali lokið"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "...retrieving failed: %s"
+msgstr "...mistókst að sækja: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "building hdlist [%s]"
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "examining MD5SUM file"
-msgstr ""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "%s: command not found\n"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "unable to register rpm file"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "retrieving hdlists file..."
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "Yes, really install it"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "added medium %s"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "md5sum mismatch"
-msgstr ""
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "afrit af [%s] brást (md5sum passar ekki)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "in order to install %s"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --serial        - prenta tag url: url.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - prentar úrelt tög: öll úrelt\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "installing %s\n"
-msgstr "Set inn %s\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "trying to promote %s"
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unable to remove package %s"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr ""
+msgid "examining pubkey file of \"%s\"..."
+msgstr "athuga lykilskrá \"%s\"..."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "Missing signature (%s)"
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
+msgid "found %d headers in cache"
+msgstr "Fann %d hausa á biðsvæði"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1893
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "mounting %s"
+msgstr "tengi %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr ""
+msgid "unmounting %s"
+msgstr "Aftengi %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "malformed input: [%s]"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "removing package %s will break your system"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "sæki rpm skrá [%s] ..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Set inn pakka `%s' (%s/%s)..."
+msgid "unable to register rpm file"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - setja aðeins inn frumkóða-pakka (engin forrit).\n"
+msgid "no package named %s"
+msgstr "Enginn '%s' pakki"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - Nota curl til að ná í skrár.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Eftirfarandi pakkar innihalda %s: %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "það eru margir pakkar með sama rpm skráaarnafn \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "do you agree ?"
-msgstr "Ertu sammála ?"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "...retrieving done"
-msgstr "...niðurhali lokið"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "bæti við pakka %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "package %s is not found."
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "skipping package %s"
-msgstr "sleppi pakka %s"
+msgid "urpmi database locked"
+msgstr "urpmi gagnagrunnur læstur"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2561
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "removing package %s"
+msgstr "fjarlægi pakka %s"
+
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "bæti við pakka %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Preparing..."
+msgid "due to missing %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - lista skrár í pakka.\n"
+#: ../urpm.pm:3010 ../urpm.pm:3040
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3012
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "afrit af [%s] brást (md5sum passar ekki)"
+msgid "due to conflicts with %s"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - prentar ósamræmi við tag: öll ósamræmi\n"
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Slæmt val.  Reyndu aftur\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -853,991 +794,1086 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - prenta þetta.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "...copying done"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - Nota aðra rót fyrir rpm uppsetningu.\n"
+
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr ""
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ítarlegri hamur.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr ""
+msgid "unknown packages"
+msgstr "óþekktir pakkar"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+msgid "unknown package"
+msgstr "Óþekktur pakki"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar fjarlægðir (%d "
+"MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
+msgid " (y/N) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr ""
+msgid "removing %s"
+msgstr "fjarlægi %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to install package %s"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf útgáfa %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Þetta er frjáls hugbúnaður dreift með skilmálum GNU GPL.\n"
+"\n"
+"notkun:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "Save file"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "unable to write config file [%s]"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
+
+#: ../urpmf:42
+#, c-format
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:43
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:44
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:45
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:46
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:47
 #, c-format
-msgid "Checking to remove the following packages"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unrequested"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "--packager      - prenta tag pakkara: Pakkað af\n"
+
+#: ../urpmf:50
+#, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:51
+#, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --serial        - prenta tag url: url.\n"
+
+#: ../urpmf:52
+#, c-format
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - prenta hvað tag skaffar: allt sem er skaffað.\n"
+
+#: ../urpmf:53
+#, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - prenta þarfir tags: allar þarfir\n"
+
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - prenta skrár tags: allar skrár\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr ""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - prentar ósamræmi við tag: öll ósamræmi\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr ""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - prentar úrelt tög: öll úrelt\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:61
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:64
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:65
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "unmounting %s"
-msgstr "Aftengi %s"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:85
 #, c-format
-msgid "...copying failed"
-msgstr "...afritun brást"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:91
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:94
 #, c-format
-msgid "unknown packages"
-msgstr "óþekktir pakkar"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - setja aðeins inn frumkóða-pakka (engin forrit).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:96
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:100
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - prenta þetta.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - Nota curl til að ná í skrár.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf útgáfa %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Þetta er frjáls hugbúnaður dreift með skilmálum GNU GPL.\n"
-"\n"
-"notkun:\n"
+"  --proxy-user   - skilgreindu sel-notanda og lykilorð til að nota til\n"
+"                   að auðkenna (snið er <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
+msgid "  --X            - use X interface.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Er það í lagi?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - prenta þarfir tags: allar þarfir\n"
+msgid "Do nothing"
+msgstr "Gera ekkert"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Afritun brást"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:230
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr ""
+msgid "Install it"
+msgstr "Setja það inn"
 
-#: ../urpm.pm:1
+#: ../urpmi:239
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:240
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "installing %s"
-msgstr "Set inn %s"
+msgid "Copying failed"
+msgstr "Afritun brást"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
+msgid "One of the following packages is needed:"
+msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Hvað viltu? (1-%d) "
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr ""
+msgid "Package installation..."
+msgstr "Pakka innsetning..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
+msgid "Initializing..."
+msgstr "Frumstilli..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "package %s is not found."
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "removing medium \"%s\""
-msgstr ""
+msgid "do you agree ?"
+msgstr "Ertu sammála ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "Cancel"
-msgstr "Hætta við"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"Eftirfarandi pakka þarf að fjarlægja til að uppfæra aðra:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Til að uppfylla innsetningarkröfur verða eftirtaldir pakkar settir inn (%d "
+"MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vinsamlega settu inn %s %s"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "--packager      - prenta tag pakkara: Pakkað af\n"
+msgid "Press Enter when ready..."
+msgstr "Sláðu á ENTER þegar tilbúinn..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Downloading package `%s'..."
+msgstr "Sæki pakka `%s'..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - prenta breytingasögu.\n"
+msgid "The following packages have bad signatures"
+msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "Innsetning brást"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr ""
+msgid "distributing %s"
+msgstr "miðla %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "copying hdlists file..."
-msgstr ""
+msgid "installing %s"
+msgstr "Set inn %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
 
-#: ../urpmf:1
+#: ../urpmi:731
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "Do nothing"
-msgstr "Gera ekkert"
+msgid "%d installation transactions failed"
+msgstr "%d Innsetningarfærslur brugðust"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "Installation is possible"
+msgstr "Innsetning er möguleg"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "mounting %s"
-msgstr "tengi %s"
+msgid "Everything already installed"
+msgstr "Allt er nú þegar komið inn"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - Nota aðra rót fyrir rpm uppsetningu.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"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"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "Only superuser is allowed to install packages"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - hreinsa hausa möppu.\n"
+
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "miðla %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "Innsetning brást"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:41
 #, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:63
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vinsamlega settu inn %s %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-url     - list available media and their url.\n"
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf útgáfa %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Þetta er frjáls hugbúnaður dreift með skilmálum GNU GPL.\n"
+"\n"
+"notkun:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:53
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "Ok"
-msgstr "Í lagi"
+msgid "  --list-media   - list available media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:56
 #, c-format
-msgid "removing %s"
-msgstr "fjarlægi %s"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:58
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:60
 #, c-format
-msgid "in order to keep %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi gagnagrunnur læstur"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - prenta breytingasögu.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "athuga lykilskrá \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista skrár í pakka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Eins af eftirtöldum pökkum er þörf til að setja inn %s:"
+
 #~ msgid "copy failed: %s"
 #~ msgstr "Afritun mistókst: %s"
 
diff --git a/po/it.po b/po/it.po
index 9887e522..34aee0af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-28 17:17+0100\n"
 "Last-Translator: Ruggero Tonelli <ruggero@valtellinux.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -44,885 +44,782 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
-"  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
-"                   installazione.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to open rpmdb"
-msgstr "non riesco ad aprire il database rpm"
+msgid "installing %s\n"
+msgstr "installazione di %s in corso\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - stampa questo messaggio di aiuto.\n"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"Installazione automatica dei pacchetti...\n"
+"Avete richiesto l'installazione del pacchetto %s\n"
 
-#: ../urpmi:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Per installare %s è richiesto uno dei seguenti pacchetti:"
+msgid "Is this OK?"
+msgstr "E' corretto?"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "removing package %s"
-msgstr "rimozione del pacchetto %s"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr ""
-"Non è possibile usare la modalità\"parallel\" con quella \"use-distrib\""
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpmi:1
+#: ../_irpm:63
 #, c-format
-msgid "Everything already installed"
-msgstr "E' già tutto installato"
+msgid "%s: command not found\n"
+msgstr "%s: comando non trovato\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
-"  -c             - ripulisci le intestazioni dalle directory in cache.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "uso il processo %d per effettuare la transazione"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - stampa questo messaggio di aiuto.\n"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
-"  --provides      - stampa il tag provides: elementi forniti dal pacchetto.\n"
+"  --group         - stampa il tag group: gruppo al quale appartiene il "
+"pacchetto.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual'è la tua scelta? (1-%d) "
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:57
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d intestazioni trovate in cache"
+msgid "unknown protocol defined for %s"
+msgstr "protocollo definito per %s  sconosciuto"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "non è stato trovato nessun webfetch, quelli supportati sono: %s\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:95
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - specifica utente e password da utilizzare per\n"
-"                   l'autenticazione col proxy (formato: <utente:password>).\n"
+msgid "unable to handle protocol: %s"
+msgstr "non riesco a gestire il protocollo: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "passo alla fase successiva per valutare le dipendenze\n"
+msgid "syntax error in config file at line %s"
+msgstr "errore di sintassi nel file di configurazione alla riga %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "recupero il file rpm [%s] ..."
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "il supporto \"%s\" cerca di usare una hdlist già usata, lo ignoro"
 
-#: ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "il supporto \"%s\" cerca di usare una lista già usata, lo ignoro"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:196
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...recupero fallito: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"non risco ad occuparmi del supporto \"%s\", il file list è già usato da un "
+"altro supporto"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
-"non riesco ad analizzare la lista dei file per \"%s\", ignoro il supporto"
+"non posso usare il nome \"%s\" per il supporto sconosciuto perchè è già in "
+"uso"
 
-#: ../urpmf:1
+#: ../urpm.pm:209
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"  -o             - operatore binario OR, vero se una delle espressioni è "
-"vera.\n"
+"non riesco a prendere in considerazione il supporto \"%s\" poichè non esiste "
+"una lista dei file [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Package installation..."
-msgstr "Installazione dei pacchetti..."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "non riesco a determinare il supporto di questo file hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nome del file rpm non valido [%s]"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "non riesco ad accedere al file hdlist di \"%s\", ignoro il supporto"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "errata dichiarazione di proxy usando la linea di comando\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "non riesco ad accedere il file list di \"%s\", ignoro il supporto"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transazioni dell'installazione fallite"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "cerco di fare a meno del supporto esistente \"%s\", evito"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"non riesco ad accedere al primo supporto di installazione (non trovo il file "
-"Mandrake/base/hdlist)"
+"il supporto virtuale \"%s\" non dovrebbe avere un file hdlist o list,\n"
+"il supporto sarà ignorato"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Spiacente, scelta errata, prova di nuovo\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"il supporto virtuale \"%s\" dovrebbe aver una url chiara, supporto ignorato."
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Choose location to save file"
-msgstr "Scegliere dove salvare i file"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
 
-#: ../urpmf:1
+#: ../urpm.pm:278
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - stampa il tag summary: sommario del pacchetto.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "non riesco a trovare il file list per \"%s\", ignoro il supporto"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:301
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "I seguenti pacchetti contengono %s: %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "lista dei file incoerente per \"%s\", ignoro il supporto"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Install it"
-msgstr "Installa"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"non riesco ad analizzare la lista dei file per \"%s\", ignoro il supporto"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usa l'interfaccia X.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "troppi punti di mount per il supporto removibile \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "E' richiesto uno dei seguenti pacchetti:"
+msgid "taking removable device as \"%s\""
+msgstr "considero il device rimovibile come \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti (%d MB)"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "sto usando un diverso dispositivo rimovibile [%s] per \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - sceglie l'interfaccia migliore a seconda dell'ambiente:\n"
-"                   X o modalità testuale.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "non riesco a recuperare il percorso per il supporto removibile \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Download del pacchetto `%s'..."
+msgid "unable to write config file [%s]"
+msgstr "non riesco a scrivere sul file di configurazione [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Cosa pu essere fatto con i file binari rpm quando viene usato --install-src"
+msgid "write config file [%s]"
+msgstr "scrivi il file di configurazione [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
-"sistema.\n"
+"Non è possibile usare la modalità\"parallel\" con quella \"use-distrib\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
 #, c-format
-msgid "no package named %s"
-msgstr "nessun pacchettto denominato %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "esamino l'handler parallelo nel file [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installazione fallita, alcuni file sono mancanti:\n"
-"%s\n"
-"Potresti voler aggiornare il tuo database di urpmi"
+msgid "found parallel handler for nodes: %s"
+msgstr "trovato handler parallelo per i nodi: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"uso: urpmi.removemedia [-a] <nome> ...\n"
-"dove <nome> è il nome del supporto da rimuovere.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "uso i supporti associati per il metodo parallelo: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "non riesco a utilizzare l'opzione parallel \"%s\" "
+
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"L'installazione non può proseguire perchè i pacchetti elencati\n"
-"devono essere rimossi per poterne aggiornare altri:\n"
-"%s\n"
+"--synthesis non può essere utilizzato con --media, -excludemedia, --"
+"sortmedia, --update o --parallel"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with` assente per il supporto in rete\n"
+msgid "examining synthesis file [%s]"
+msgstr "esamino il file synthesis [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
+msgid "examining hdlist file [%s]"
+msgstr "esamino il file hdlist [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "pacchetto sconosciuto"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "il supporto virtuale \"%s\" non è locale, sarà ignorato"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "L'installazione è possibile"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problema nel leggere il file hdlist/synthesis del supporto \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"I pacchetti elencati devono essere rimossi per poterne aggiornare altri:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "passo alla fase successiva per valutare le dipendenze\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Per soddisfare le dipendenze, saranno installati i seguenti %d pacchetti (%d "
-"MB)"
+msgid "skipping package %s"
+msgstr "salto il pacchetto %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"non riesco a prendere in considerazione il supporto \"%s\" poichè non esiste "
-"una lista dei file [%s]"
+msgid "would install instead of upgrade package %s"
+msgstr "installerebbe il pacchetto %s invece di aggiornarlo "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "unable to open rpmdb"
+msgstr "non riesco ad aprire il database rpm"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "non posso aggiungere gli aggiornamenti della distribuzione cooker\n"
+msgid "medium \"%s\" already exists"
+msgstr "il supporto \"%s\" esiste già"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalità prolissa.\n"
+msgid "virtual medium need to be local"
+msgstr "il supporto virtuale deve essere locale"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "Inizializzazione..."
+msgid "added medium %s"
+msgstr "supporto %s aggiunto"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - elenca i pacchetti disponibili.\n"
+msgid "unable to access first installation medium"
+msgstr "non riesco ad accedere al primo supporto di installazione"
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - stampa tutti i tag.\n"
+msgid "copying hdlists file..."
+msgstr "copio i file hdlist..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
+msgid "...copying failed"
+msgstr "...copia fallita"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...copia terminata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"il supporto virtuale \"%s\" non dovrebbe avere un file hdlist o list,\n"
-"il supporto sarà ignorato"
+"non riesco ad accedere al primo supporto di installazione (non trovo il file "
+"Mandrake/base/hdlist)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "controllo md5sum del file hdlist (o synthesis) copiato"
+msgid "retrieving hdlists file..."
+msgstr "recupero i file hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
+msgid "...retrieving done"
+msgstr "...recupero terminato"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Premi Invio quando sei pronto..."
+msgid "...retrieving failed: %s"
+msgstr "...recupero fallito: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opzioni sconosciute '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - divide l'operazione in piccole transazioni se pi di\n"
-"                   un pacchetto sta per essere installato o\n"
-"                   aggiornato, il valore predefinito è %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "tentativo di selezionare un supporto inesistente \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problema nel leggere il file hdlist/synthesis del supporto \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "sto selezionando più supporti: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget per recuperare file remoti.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - abilita la ricerca tra i provides del pacchetto.\n"
+msgid "removing medium \"%s\""
+msgstr "rimuovo il supporto \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "sto costruendo il file hdlist [%s]"
+"impossibile accedere al supporto \"%s\",\n"
+"questo pu succedere se avete montato manualmente la directory durante la "
+"creazione del supporto"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - usa i pacchetti esistenti se possibile, rifiuta\n"
-"                   i pacchetti richiesti se sono da rimuovere.\n"
+"il supporto virtuale \"%s\" dovrebbe avere un percorso valido per hdlist o "
+"synthesis, supporto ignorato."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "esamino il file MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copio il file di descrizione di \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comando non trovato\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "calcolo md5sum del file hdlist (o synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "impossibile registrare il file rpm"
+msgid "examining MD5SUM file"
+msgstr "esamino il file MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
-"                   dei pacchetti senza controllare le dipendenze.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copio il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "non riesco a gestire il protocollo: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "recupero i file hdlist..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "controllo md5sum del file hdlist (o synthesis) copiato"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Installa"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "copia di [%s] fallita (md5sum non corretta)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "supporto %s aggiunto"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema nel leggere il file synthesis del supporto \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
+msgid "reading rpm files from [%s]"
+msgstr "sto leggendo i file rpm da [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"creata transazione per installare su %s (rimuovi=%d, installa=%d, aggiorna=%"
-"d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "non riesco a leggere i file rpm da [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum errata"
+msgid "no rpm files found from [%s]"
+msgstr "nessun file rpm trovato da [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "errore di sintassi nel file di configurazione alla riga %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "recupero il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  i nomi o file rpm passati da riga di comando verranno installati.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "ho trovato la hdlist (o synthesis) analizzata come %s..."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - usa il proxy HTTP specificato, il numero di porta\n"
-"                    predefinito è1080 (formato: <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "calcolo md5sum del file hdlist (or synthesis) scaricato"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "per installare %s"
+msgid "md5sum mismatch"
+msgstr "md5sum errata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s entry riposizionate nella deplist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "recupero del file hdlist (o synthesis) fallito"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignora la distinzione tra maiuscole/minuscole in "
-"qualsiasi pattern.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "non trovo il file hdlist per il supporto \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Impossibile creare una directory [%s] per un bug report"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file [%s] gi�in uso nello stesso supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "installerebbe il pacchetto %s invece di aggiornarlo "
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "recupero i mirror presso %s..."
+msgid "unable to write list file of \"%s\""
+msgstr "non riesco a scrivere il list file di \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
-"  --url          - stampa il tag url: url di riferimento del pacchetto.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "scrivo la lista di file per il supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocollo definito per %s  sconosciuto"
+msgid "nothing written in list file for \"%s\""
+msgstr "non è stato scritto nulla nel list file per \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - stampa versione e release anche col nome.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "controllo il file pubkey di \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - stampa il tag obsolete: tutto quello reso obsoleto dal "
-"pacchetto.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importata la chiave %s dal file pubkey di \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "il supporto \"%s\" esiste già"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "non riesco ad importare il file pubkey di \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "installazione di %s in corso\n"
+msgid "reading headers from medium \"%s\""
+msgstr "sto leggendo le intestazioni dal supporto \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"la voce da aggiornare non �presente\n"
-"(uno di %s)\n"
+msgid "building hdlist [%s]"
+msgstr "sto costruendo il file hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "sto selezionando %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ho costruito il file hdlist (o synthesis) per il supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "impossibile rimuovere il pacchetto %s"
+msgid "found %d headers in cache"
+msgstr "%d intestazioni trovate in cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problema nel leggere il file synthesis del supporto \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "sto rimuovendo %d intestazioni obsolete in cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"la voce da rimuovere non è presente\n"
-"(uno di %s)\n"
+msgid "mounting %s"
+msgstr "sto montando %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - seleziona tutti i supporti.\n"
+msgid "unmounting %s"
+msgstr "sto smontando %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Firma mancante (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "%s entry riposizionate nella deplist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "non riesco a leggere i file rpm da [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "nessuna entry riallocata nella depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "recupero il file rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "non riesco ad accedere al file rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+msgid "unable to register rpm file"
+msgstr "impossibile registrare il file rpm"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr ""
-"  --group         - stampa il tag group: gruppo al quale appartiene il "
-"pacchetto.\n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "errore durante la registrazione dei pacchetti locali"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "il supporto \"%s\" cerca di usare una lista già usata, lo ignoro"
+msgid "no package named %s"
+msgstr "nessun pacchettto denominato %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input malformato: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "I seguenti pacchetti contengono %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "la rimozione del pacchetto %s comprometterà il sistema"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ci sono diversi pacchetti rpm con lo stesso nome di file \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - elenca i supporti disponibili.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "non riesco ad analizzare correttamente [%s] per il valore \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Alcuni dei pacchetti richiesti non possono essere installati:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
+"il supporto \"%s\" fa uso di una lista di file non valida:\n"
+"  probabilmente il mirror non è aggiornato, prova a usare un metodo "
+"alternativo."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nessuna entry riallocata nella depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "il supporto \"%s\" non specifica una posizione per i file RPM"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
+msgid "package %s is not found."
+msgstr "il pacchetto %s non è stato trovato"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
+msgid "urpmi database locked"
+msgstr "database urpmi bloccato"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "il supporto \"%s\" non è selezionato"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "confermi?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "lista dei file incoerente per \"%s\", ignoro il supporto"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "supporto incoerente \"%s\", segnato come removibile ma non tale"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...recupero terminato"
+msgid "unable to access medium \"%s\""
+msgstr "non riesco ad accedere al supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "aggiunta del pacchetto %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "input malformato: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "salto il pacchetto %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "recupero i file rpm dal supporto \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma non valida (%s)"
+msgid "Preparing..."
+msgstr "In preparazione..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
+msgid "using process %d for executing transaction"
+msgstr "uso il processo %d per effettuare la transazione"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versione %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
-"Questo è software gratuito e pu essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "non riesco ad analizzare correttamente [%s] per il valore \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "non riesco a determinare il supporto di questo file hdlist [%s]"
+"creata transazione per installare su %s (rimuovi=%d, installa=%d, aggiorna=%"
+"d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "non riesco ad analizzare l'hdlist file di \"%s\""
+msgid "unable to create transaction"
+msgstr "non riesco a creare la transazione"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "il supporto \"%s\" cerca di usare una hdlist già usata, lo ignoro"
+msgid "removing package %s"
+msgstr "rimozione del pacchetto %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "per conflitti con %s"
+msgid "unable to remove package %s"
+msgstr "impossibile rimuovere il pacchetto %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "sto rimuovendo %d intestazioni obsolete in cache"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "aggiunta del pacchetto %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "impossibile installare il pacchetto %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
+msgid "due to missing %s"
+msgstr "perchè manca %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "il supporto virtuale \"%s\" non è locale, sarà ignorato"
+msgid "due to unsatisfied %s"
+msgstr "perchè non è soddisfatto %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "In preparazione..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
+msgid "trying to promote %s"
+msgstr "sto selezionando %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sto usando un diverso dispositivo rimovibile [%s] per \"%s\""
+msgid "in order to keep %s"
+msgstr "per tenere %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - non cerca nessun file synthesis o hdlist.\n"
+msgid "in order to install %s"
+msgstr "per installare %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - non cercare tra i provides per trovare il pacchetto.\n"
+msgid "due to conflicts with %s"
+msgstr "per conflitti con %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "copia di [%s] fallita (md5sum non corretta)"
+msgid "unrequested"
+msgstr "non richiesto"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito.\n"
-"                   Permette di interrrogare una distribuzione.\n"
+msgid "Invalid signature (%s)"
+msgstr "Firma non valida (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Key ID (%s) non valida"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
-"cosa.\n"
+msgid "Missing signature (%s)"
+msgstr "Firma mancante (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"non posso usare il nome \"%s\" per il supporto sconosciuto perchè è già in "
-"uso"
+msgid "bad proxy declaration on command line\n"
+msgstr "errata dichiarazione di proxy usando la linea di comando\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts     - stampa il tag conflicts: tutti i conflitti rilevati per "
-"il pacchetto.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"il supporto virtuale \"%s\" dovrebbe avere un percorso valido per hdlist o "
-"synthesis, supporto ignorato."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Spiacente, scelta errata, prova di nuovo\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -939,677 +836,761 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"uso: urpmi.addmedia [opzioni] <nome> <url> [con <percorso_relativo>]\n"
-"dove <url> è uno fra\n"
-"       file://<percorso>\n"
-"       ftp://<login>:<password>@<host>/<percorso> con <nome relativo del "
-"file hdlist>\n"
-"       ftp://<host>/<percorso> with <nome relativo del file hdlist>\n"
-"       http://<host>/<percorso> with <nome relativo del file hdlist>\n"
-"       rimovibile://<percorso>\n"
-"\n"
-"e le [opzioni] una combinazione di\n"
-
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copio il file hdlist (o synthesis) di \"%s\"..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - stampa questo messaggio di aiuto.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "...copia terminata"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - include automaticamente un pacchetto nelle scelte.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "non riesco a utilizzare l'opzione parallel \"%s\" "
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifica che l'installazione possa avvenire "
+"correttamente.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"il supporto \"%s\" fa uso di una lista di file non valida:\n"
-"  probabilmente il mirror non è aggiornato, prova a usare un metodo "
-"alternativo."
+"  --force        - forza l'esecuzione anche se alcuni pacchetti non "
+"esistono.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "non riesco ad accedere al primo supporto di installazione"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuito fra varie macchine.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "il supporto virtuale deve essere locale"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --root         - cambia la directory di root per installare i file rpm "
+"\"chrooted\".\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
-msgstr "errore durante la registrazione dei pacchetti locali"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito, "
+"utile\n"
+"                   per (dis)installare un pacchetto chroot con l'opzione --"
+"root.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita la velocit�del download.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalità prolissa.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "ho trovato la hdlist (o synthesis) analizzata come %s..."
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - seleziona tutti i pacchetti che soddisfano "
+"l'espressione.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "recupero del file hdlist (o synthesis) fallito"
+msgid "unknown packages"
+msgstr "pacchetti sconosciuti"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nessun file rpm trovato da [%s]"
+msgid "unknown package"
+msgstr "pacchetto sconosciuto"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "non è stato scritto nulla nel list file per \"%s\""
+msgid "removing package %s will break your system"
+msgstr "la rimozione del pacchetto %s comprometterà il sistema"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "I seguenti pacchetti hanno delle firme errate"
+msgid "Nothing to remove"
+msgstr "Niente da rimuovere"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "calcolo md5sum del file hdlist (o synthesis)"
+msgid "Checking to remove the following packages"
+msgstr "Controllo la rimozione dei seguenti pacchetti:"
 
-#: ../urpmq:1
+#: ../urpme:106
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to install package %s"
-msgstr "impossibile installare il pacchetto %s"
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - permette di chiedere all'utente se desidera installare\n"
-"                   dei pacchetti senza controllare dipendenze e integrità.\n"
+msgid "removing %s"
+msgstr "rimozione di %s"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
-msgid "Save file"
-msgstr "Salva il file"
+msgid "Removing failed"
+msgstr "Rimozione fallita"
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: non posso leggere il file rpm \"%s\"\n"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versione %s\n"
+"Copyright (C) 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
+"Questo è software gratuito e pu essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "non riesco a scrivere sul file di configurazione [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpme:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  -a             - seleziona tutti i pacchetti che soddisfano "
-"l'espressione.\n"
+"  --media        - usa solo i supporti nella lista, separati da virgole.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Key ID (%s) non valida"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --force        - forza l'esecuzione anche se alcuni pacchetti non "
-"esistono.\n"
+"  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
+"virgole\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "non riesco a recuperare il percorso per il supporto removibile \"%s\""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:38
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalità prolissa.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
+"  --quiet         - non stampare il tag name (predefinito se non viene \n"
+"                    usato il tag nella riga di comando, incompatibile \n"
+"                    con la modalità interattiva).\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - non stampa le linee uguali.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "manca <percorso relativo di hdlist>\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - stampa tutti i tag.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Controllo la rimozione dei seguenti pacchetti:"
+msgid "  --group        - print tag group: group.\n"
+msgstr ""
+"  --group         - stampa il tag group: gruppo al quale appartiene il "
+"pacchetto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unrequested"
-msgstr "non richiesto"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - stampa la tag size: dimensione del pacchetto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "non riesco ad accedere al file rpm [%s]"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - stampa il tag epoch: epoca di compilazione.\n"
 
-#: ../urpmf:1
+#: ../urpmf:46
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr ""
-"  --files         - stampa il tag files: tutti i files presenti nel "
-"pacchetto.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - stampa il tag summary: sommario del pacchetto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "non riesco ad effettuare il parsing di \"%s\" nel file [%s]"
+msgid "  --description  - print tag description: description.\n"
+msgstr ""
+"  --description   - stampa il tag description: descrizione del pacchetto.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vuoi proseguire con l'installazione?"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr ""
+"  --sourcerpm    - stampa il tag sourcerpm: pacchetti rpm con sorgenti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "non riesco a leggere il file rpm [%s] dal supporto \"%s\""
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - mostra il tag packager: curatore del pacchetto.\n"
 
-#: ../urpmi:1
+#: ../urpmf:50
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
-"..--use-distrib  - configura urpmi \"al volo\" da un albero distribuito, "
-"utile\n"
-"                       per installare un pacchetto chroot con l'opzione --"
-"root.\n"
+"  --buildhost    - mostra il tag buildhost: host sul quale è stato compilato "
+"il pacchetto.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ho costruito il file hdlist (o synthesis) per il supporto \"%s\""
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
+"  --url          - stampa il tag url: url di riferimento del pacchetto.\n"
 
-#: ../urpmq:1
+#: ../urpmf:52
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - stampa informazioni utili in forma leggibile.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - stampa il tag provides: elementi forniti dal pacchetto.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
-"  --version      - usa una specifica versione, come opzione predefinita\n"
-"                   viene usata quella installata con la versione corrente\n"
-"                   Mandrake Linux.\n"
+"  --requires      - stampa il tag requires: tutti i requisiti necessari per "
+"installare il pacchetto.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:54
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
-"  --from         - usa l'url specificata per ottenere la lista dei mirror, \n"
-"                   quella predefinita è%s\n"
+"  --files         - stampa il tag files: tutti i files presenti nel "
+"pacchetto.\n"
 
-#: ../urpme:1
+#: ../urpmf:55
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
-"  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito, "
-"utile\n"
-"                   per (dis)installare un pacchetto chroot con l'opzione --"
-"root.\n"
+"  --conflicts     - stampa il tag conflicts: tutti i conflitti rilevati per "
+"il pacchetto.\n"
 
-#: ../urpmf:1
+#: ../urpmf:56
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - NOT unario, vero se l'espressione è falsa.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - stampa il tag obsolete: tutto quello reso obsoleto dal "
+"pacchetto.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"La directory [%s] esiste già usate un'altra directory per i bug report o "
-"cancellatela"
+"  --env          - usa un ambiente specifico (tipicamente un bug \n"
+"                   report).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:59
 #, c-format
-msgid "unmounting %s"
-msgstr "sto smontando %s"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignora la distinzione tra maiuscole/minuscole in "
+"qualsiasi pattern.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - stampa versione, release e architettura con il nome.\n"
 
-#: ../urpmi:1
+#: ../urpmf:61
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completati, velocità= %s"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
 
-#: ../urpmi:1
+#: ../urpmf:62
 #, c-format
-msgid "restarting urpmi"
-msgstr "Riavvio urpmi"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr ""
+"  -a             - operatore binario AND, vero se entrambe le espressioni "
+"sono vere.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "esamino il file synthesis [%s]"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - operatore binario OR, vero se una delle espressioni è "
+"vera.\n"
 
-#: ../urpmi:1
+#: ../urpmf:64
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - NOT unario, vero se l'espressione è falsa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:65
 #, c-format
-msgid "...copying failed"
-msgstr "...copia fallita"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - parentesi sinistra per aprire un gruppo di espressioni.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "non riesco ad accedere al file hdlist di \"%s\", ignoro il supporto"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - parentesi destra per chiudere un gruppo di espressioni.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modalità silenziosa.\n"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"il callback è:\n"
+"%s\n"
 
-#: ../urpmf:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modalità prolissa.\n"
+msgid "using specific environment on %s\n"
+msgstr "uso le variabili d'ambiente su %s\n"
 
-#: ../urpmq:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"  --sources      - elenca tutti i pacchetti sorgenti prima del download "
-"(solo root).\n"
 
-#: ../urpmq:1
+#: ../urpmi:72
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --headers      - estrae le intestazioni per il pacchetto selezionato dal \n"
-"                   database di urpmi allo stdout (solo root).\n"
+"urpmi versione %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
+"Questo è software gratuito e pu essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpme:1
+#: ../urpmi:82
 #, c-format
-msgid "unknown packages"
-msgstr "pacchetti sconosciuti"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "sto selezionando più supporti: %s"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - seleziona automaticamente i pacchetti per aggiornare il "
+"sistema.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:85
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  -f             - stampa versione, release e architettura con il nome.\n"
+"  --no-uninstall - non chiedere mai di rimuovere un pacchetto, ferma "
+"l'installazione\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file [%s] gi�in uso nello stesso supporto \"%s\""
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - usa i pacchetti esistenti se possibile, rifiuta\n"
+"                   i pacchetti richiesti se sono da rimuovere.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:88
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - divide l'operazione in piccole transazioni se pi di\n"
+"                   un pacchetto sta per essere installato o\n"
+"                   aggiornato, il valore predefinito è %d.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "non riesco a trovare il file list per \"%s\", ignoro il supporto"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - per avere transazione più corte, il default è %d.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - stampa questo messaggio di aiuto.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "trovato handler parallelo per i nodi: %s"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - il prossimo pacchetto è un pacchetto sorgente (uguale a -"
+"s).\n"
 
-#: ../urpmf:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"il callback è:\n"
-"%s\n"
+"  --install-src  - installa solo il pacchetto dei sorgenti (non i binari).\n"
 
-#: ../urpmq:1
+#: ../urpmi:95
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - rimuove gli rpm dalla cache prima di fare qualsiasi altra "
+"cosa.\n"
 
-#: ../urpmf:1
+#: ../urpmi:96
 #, 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 versione %s\n"
-"Copyright (C) 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
-"Questo è software gratuito e pu essere ridistribuito sotto i termini della "
-"GNU GPL.\n"
-"\n"
-"uso:\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  --quiet         - non stampare il tag name (predefinito se non viene \n"
-"                    usato il tag nella riga di comando, incompatibile \n"
-"                    con la modalità interattiva).\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - non stampa le linee uguali.\n"
+"  --allow-nodeps - permette di chiedere all'utente se desidera installare\n"
+"                   dei pacchetti senza controllare le dipendenze.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"--synthesis non può essere utilizzato con --media, -excludemedia, --"
-"sortmedia, --update o --parallel"
+"  --allow-force  - permette di chiedere all'utente se desidera installare\n"
+"                   dei pacchetti senza controllare dipendenze e integrità.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"  --arch         - usa una specifica architettura, quella predefinita è\n"
-"                   l'architettura della versione di Mandrake Linux "
-"installata.\n"
+"..--use-distrib  - configura urpmi \"al volo\" da un albero distribuito, "
+"utile\n"
+"                       per installare un pacchetto chroot con l'opzione --"
+"root.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "Is this OK?"
-msgstr "E' corretto?"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget per recuperare file remoti.\n"
 
-#: ../urpmi:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - esclude i file di documentazione.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita la velocit�del download.\n"
+
+#: ../urpmi:109
+#, c-format
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
+"..--resume       - riprende il trasferimento dei file parzialmente "
+"scaricati\n"
+"                     (--no-resume lo disabilita, di default è "
+"disabilitato).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "esamino l'handler parallelo nel file [%s]"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - usa il proxy HTTP specificato, il numero di porta\n"
+"                    predefinito è1080 (formato: <proxyhost[:port]>).\n"
 
-#: ../urpme:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "Nothing to remove"
-msgstr "Niente da rimuovere"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - specifica utente e password da utilizzare per\n"
+"                   l'autenticazione col proxy (formato: <utente:password>).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:115
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importata la chiave %s dal file pubkey di \"%s\""
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug          - produce un bug report nella directory indicata con\n"
+"                   l'argomento successivo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "sto leggendo le intestazioni dal supporto \"%s\""
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usa l'interfaccia X.\n"
 
-#: ../urpmq:1
+#: ../urpmi:120
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - sceglie l'interfaccia migliore a seconda dell'ambiente:\n"
+"                   X o modalità testuale.\n"
 
-#: ../urpmi:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --bug          - produce un bug report nella directory indicata con\n"
-"                   l'argomento successivo.\n"
+"  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
+"                   (--no-verify la disabilita, abilitata di default).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "il supporto \"%s\" non specifica una posizione per i file RPM"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - percorsi da escludere, separati da virgole.\n"
 
-#: ../urpmf:1
+#: ../urpmi:126
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - esclude i file di documentazione.\n"
+
+#: ../urpmi:127 ../urpmq:79
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --sourcerpm    - stampa il tag sourcerpm: pacchetti rpm con sorgenti.\n"
+"  -a             - seleziona tutte le corrispondenze da riga di comando.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "non riesco a scrivere il list file di \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - abilita la ricerca tra i provides del pacchetto.\n"
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
-"  --requires      - stampa il tag requires: tutti i requisiti necessari per "
-"installare il pacchetto.\n"
+"  -P             - non cercare tra i provides per trovare il pacchetto.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "tentativo di selezionare un supporto inesistente \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\n"
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --description   - stampa il tag description: descrizione del pacchetto.\n"
+"  -s             - il prossimo pacchetto è un pacchetto sorgente (uguale a --"
+"src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "Copying failed"
-msgstr "Copia fallita"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalità silenziosa.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forza la generazione dei file hdlist.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  i nomi o file rpm passati da riga di comando verranno installati.\n"
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes pu essere usato solo con --parallel"
+msgid "Choose location to save file"
+msgstr "Scegliere dove salvare i file"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "non trovo il file hdlist per il supporto \"%s\""
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Cosa pu essere fatto con i file binari rpm quando viene usato --install-src"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"  -s             - il prossimo pacchetto è un pacchetto sorgente (uguale a --"
-"src).\n"
+"Avete selezionato un pacchetto sorgente:\n"
+"\n"
+"%s\n"
+"\n"
+"Probabilmente non volete installarlo sul vostro computer (installandolo \n"
+"vi permetterebbe di modificarne i sorgenti e successivamente di "
+"compilarlo).\n"
+"\n"
+"Cosa volete fare?"
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "installing %s"
-msgstr "installazione di %s"
+msgid "Do nothing"
+msgstr "Annulla"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "sto leggendo i file rpm da [%s]"
+msgid "Yes, really install it"
+msgstr "Installa"
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copio il file di descrizione di \"%s\"..."
+msgid "Save file"
+msgstr "Salva il file"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --auto         - include automaticamente un pacchetto nelle scelte.\n"
+"Avete scelto di installare il seguente pacchetto software sul vostro "
+"computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Potreste preferire salvarlo. >>Qual'è la vostra scelta? "
 
-#: ../urpme:1
+#: ../urpmi:230
 #, c-format
-msgid "Removing failed"
-msgstr "Rimozione fallita"
+msgid "Install it"
+msgstr "Installa"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  --virtual      - crea supporti virtuali che sono sempre aggiornati,\n"
-"                   è permesso soltanto il protocollo file://.\n"
+"La directory [%s] esiste già usate un'altra directory per i bug report o "
+"cancellatela"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "il pacchetto %s non è stato trovato"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Impossibile creare una directory [%s] per un bug report"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "rimuovo il supporto \"%s\""
+msgid "Copying failed"
+msgstr "Copia fallita"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
+msgid "Only superuser is allowed to install packages"
+msgstr "Solo superuser è abilitato ad installare pacchetti"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Annulla"
+msgid "One of the following packages is needed:"
+msgstr "E' richiesto uno dei seguenti pacchetti:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - il prossimo pacchetto è un pacchetto sorgente (uguale a -"
-"s).\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual'è la tua scelta? (1-%d) "
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - usa un ambiente specifico (tipicamente un bug \n"
-"                   report).\n"
+msgid "Package installation..."
+msgstr "Installazione dei pacchetti..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Inizializzazione..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
-"virgole\n"
+"Alcuni dei pacchetti richiesti non possono essere installati:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "non riesco ad accedere al supporto \"%s\""
+msgid "do you agree ?"
+msgstr "confermi?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "non riesco a creare il supporto \"%s\"\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"L'installazione non può proseguire perchè i pacchetti elencati\n"
+"devono essere rimossi per poterne aggiornare altri:\n"
+"%s\n"
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - mostra il tag packager: curatore del pacchetto.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"I pacchetti elencati devono essere rimossi per poterne aggiornare altri:\n"
+"%s"
 
-#: ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --dump-config  - mostra la configurazione nella forma usata da urpmi."
-"addmedia\n"
+"Per soddisfare le dipendenze, saranno installati i seguenti %d pacchetti (%d "
+"MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1618,401 +1599,429 @@ msgstr ""
 "Dovete essere root per installare le seguenti dipendenze:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - mostra la lista delle modifiche.\n"
+msgid "unable to get source packages, aborting"
+msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "non riesco ad accedere il file list di \"%s\", ignoro il supporto"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr ""
+"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - parentesi destra per chiudere un gruppo di espressioni.\n"
+msgid "Press Enter when ready..."
+msgstr "Premi Invio quando sei pronto..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "non è stato trovato nessun webfetch, quelli supportati sono: %s\n"
+msgid "Downloading package `%s'..."
+msgstr "Download del pacchetto `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "esamino il file hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s completati, ETA = %s, velocità= %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copio i file hdlist..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completati, velocità= %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "scrivo la lista di file per il supporto \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "I seguenti pacchetti hanno delle firme errate"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"il supporto virtuale \"%s\" dovrebbe aver una url chiara, supporto ignorato."
+msgid "Do you want to continue installation ?"
+msgstr "Vuoi proseguire con l'installazione?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  --buildhost    - mostra il tag buildhost: host sul quale è stato compilato "
-"il pacchetto.\n"
+"Installazione fallita, alcuni file sono mancanti:\n"
+"%s\n"
+"Potresti voler aggiornare il tuo database di urpmi"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Annulla"
+msgid "Installation failed"
+msgstr "Installazione fallita"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "uso i supporti associati per il metodo parallelo: %s"
+msgid "distributing %s"
+msgstr "distribuzione di %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "sto montando %s"
+msgid "installing %s"
+msgstr "installazione di %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"non risco ad occuparmi del supporto \"%s\", il file list è già usato da un "
-"altro supporto"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "non riesco a recuperare il pacchetto sorgente, interrompo"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
-"  --root         - cambia la directory di root per installare i file rpm "
-"\"chrooted\".\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Provo l'installazione in modo ancora più forzato (--force)? (s/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% di %s completati, ETA = %s, velocità= %s"
+msgid "%d installation transactions failed"
+msgstr "%d transazioni dell'installazione fallite"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "calcolo md5sum del file hdlist (or synthesis) scaricato"
+msgid "Installation is possible"
+msgstr "L'installazione è possibile"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "non riesco ad importare il file pubkey di \"%s\""
+msgid "Everything already installed"
+msgstr "E' già tutto installato"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
-"  --no-uninstall - non chiedere mai di rimuovere un pacchetto, ferma "
-"l'installazione\n"
+msgid "restarting urpmi"
+msgstr "Riavvio urpmi"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq versione %s\n"
-"Copyright (C) 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
-"Questo è software libero e pu essere ridistribuito secondo i termini della "
-"GNU GPL.\n"
+"uso: urpmi.addmedia [opzioni] <nome> <url> [con <percorso_relativo>]\n"
+"dove <url> è uno fra\n"
+"       file://<percorso>\n"
+"       ftp://<login>:<password>@<host>/<percorso> con <nome relativo del "
+"file hdlist>\n"
+"       ftp://<host>/<percorso> with <nome relativo del file hdlist>\n"
+"       http://<host>/<percorso> with <nome relativo del file hdlist>\n"
+"       rimovibile://<percorso>\n"
 "\n"
-"uso:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "recupero il file hdlist (o synthesis) di \"%s\"..."
+"e le [opzioni] una combinazione di\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - stampa i gruppi anche col nome.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - crea un supporto di aggiornamento.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "il supporto \"%s\" non è selezionato"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - cerca e usa il file synthesis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Solo superuser è abilitato ad installare pacchetti"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uso le variabili d'ambiente su %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - non cerca nessun file synthesis o hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "non riesco a trovare l'hdlist file per \"%s\", supporto ignorato"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crea automaticamente tutti i supporti da quelli di\n"
+"                   installazione.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - per avere transazione più corte, il default è %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - crea automaticamente un supporto per una parte XXX di\n"
+"                   una distribuzione, XXX può essere main, contrib, updates "
+"o\n"
+"                   qualsiasi altra cosa configurata ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"  (              - parentesi sinistra per aprire un gruppo di espressioni.\n"
+"  --from         - usa l'url specificata per ottenere la lista dei mirror, \n"
+"                   quella predefinita è%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "troppi punti di mount per il supporto removibile \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - usa una specifica versione, come opzione predefinita\n"
+"                   viene usata quella installata con la versione corrente\n"
+"                   Mandrake Linux.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - operatore binario AND, vero se entrambe le espressioni "
-"sono vere.\n"
+"  --arch         - usa una specifica architettura, quella predefinita è\n"
+"                   l'architettura della versione di Mandrake Linux "
+"installata.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"impossibile accedere al supporto \"%s\",\n"
-"questo pu succedere se avete montato manualmente la directory durante la "
-"creazione del supporto"
+"  --virtual      - crea supporti virtuali che sono sempre aggiornati,\n"
+"                   è permesso soltanto il protocollo file://.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr ""
-"  --group         - stampa il tag group: gruppo al quale appartiene il "
-"pacchetto.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
-"  --media        - usa solo i supporti nella lista, separati da virgole.\n"
+"  -c             - ripulisci le intestazioni dalle directory in cache.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "non riesco a creare la transazione"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forza la generazione dei file hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "recupero i file rpm dal supporto \"%s\""
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "non posso aggiungere gli aggiornamenti della distribuzione cooker\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Avete selezionato un pacchetto sorgente:\n"
-"\n"
-"%s\n"
-"\n"
-"Probabilmente non volete installarlo sul vostro computer (installandolo \n"
-"vi permetterebbe di modificarne i sorgenti e successivamente di "
-"compilarlo).\n"
-"\n"
-"Cosa volete fare?"
+msgid "retrieving mirrors at %s ..."
+msgstr "recupero i mirror presso %s..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "distribuzione di %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "non c'è bisogno di fornire <percorso relativo di hdlist> con --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Installazione fallita"
+msgid "unable to update medium \"%s\"\n"
+msgstr "non riesco ad aggiornare il supporto \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "scrivi il file di configurazione [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "manca <percorso relativo di hdlist>\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with` assente per il supporto in rete\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - stampa il tag epoch: epoca di compilazione.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "non riesco a creare il supporto \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - verifica la firma RPM prima dell'installazione\n"
-"                   (--no-verify la disabilita, abilitata di default).\n"
+"uso: urpmi.removemedia [-a] <nome> ...\n"
+"dove <nome> è il nome del supporto da rimuovere.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - seleziona tutti i supporti.\n"
+
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
+"\n"
+"opzioni sconosciute '%s'\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea un supporto di aggiornamento.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niente da rimuovere (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url   - elenca i supporti disponibili e la loro url.\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"la voce da rimuovere non è presente\n"
+"(uno di %s)\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:28
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impone una ricerca fuzzy (uguale a --fuzzy).\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uso: urpmi.update [opzioni] <nome> ...\n"
+"dove <nome> è il nome del supporto da aggiornare.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --update       - update only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descrizione hdlist non valida \"%s\" nei file di hdlist"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forza l'aggiornamento della chiave gpg.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:41
 #, c-format
-msgid "removing %s"
-msgstr "rimozione di %s"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - seleziona tutti i supporti non rimovibili.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
+
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --distrib-XXX  - crea automaticamente un supporto per una parte XXX di\n"
-"                   una distribuzione, XXX può essere main, contrib, updates "
-"o\n"
-"                   qualsiasi altra cosa configurata ;-)\n"
+"la voce da aggiornare non �presente\n"
+"(uno di %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versione %s\n"
+"Copyright (C) 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
+"Questo è software gratuito e pu essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmf:1
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - stampa la tag size: dimensione del pacchetto.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - elenca i pacchetti disponibili.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
-msgstr "per tenere %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - elenca i supporti disponibili.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "perchè non è soddisfatto %s"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url   - elenca i supporti disponibili e la loro url.\n"
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Installazione automatica dei pacchetti...\n"
-"Avete richiesto l'installazione del pacchetto %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "database urpmi bloccato"
+"  --dump-config  - mostra la configurazione nella forma usata da urpmi."
+"addmedia\n"
 
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
-"..--resume       - riprende il trasferimento dei file parzialmente "
-"scaricati\n"
-"                     (--no-resume lo disabilita, di default è "
-"disabilitato).\n"
+"  --list-nodes   - elenca i nodi disponibili quando si utilizza --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "controllo il file pubkey di \"%s\"..."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - elenca gli alias paralleli disponibili.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - estrae le intestazioni per il pacchetto selezionato dal \n"
+"                   database di urpmi allo stdout (solo root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "considero il device rimovibile come \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - elenca tutti i pacchetti sorgenti prima del download "
+"(solo root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Avete scelto di installare il seguente pacchetto software sul vostro "
-"computer:\n"
-"\n"
-"%s\n"
-"\n"
-"Potreste preferire salvarlo. >>Qual'è la vostra scelta? "
+"  --use-distrib  - configura urpmi \"al volo\" da un albero distribuito.\n"
+"                   Permette di interrrogare una distribuzione.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impone una ricerca fuzzy (uguale a -y).\n"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - mostra la lista delle modifiche.\n"
 
-#: ../urpmq:1
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - estende la ricerca alle dipendenze del pacchetto.\n"
+
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2021,42 +2030,79 @@ msgstr ""
 "  -u             - rimuove il pacchetto se una versione più recente è "
 "giàinstallata.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - prova ad usare un altro file hdlist.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - risultati completi con i pacchetti da rimuovere.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "perchè manca %s"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ricerca a ritroso sui requisiti del pacchetto.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - stampa informazioni utili in forma leggibile.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - stampa i gruppi anche col nome.\n"
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - stampa versione e release anche col nome.\n"
+
+#: ../urpmq:89
+#, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -l         - elenca i file presenti in un pacchetto.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"uso: urpmi.update [opzioni] <nome> ...\n"
-"dove <nome> è il nome del supporto da aggiornare.\n"
+"  i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "cerco di fare a meno del supporto esistente \"%s\", evito"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes pu essere usato solo con --parallel"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test         - verifica che l'installazione possa avvenire "
-"correttamente.\n"
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "non �stata trovata una lista completa dei supporti"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Per installare %s è richiesto uno dei seguenti pacchetti:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versione %s\n"
+#~ "Copyright (C) 2000, 2001, 2002, 2003, 2004 MandrakeSoft.\n"
+#~ "Questo è software libero e pu essere ridistribuito secondo i termini "
+#~ "della GNU GPL.\n"
+#~ "\n"
+#~ "uso:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Webfetch sconosciuto `%s' !!!\n"
@@ -2223,9 +2269,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "prova urmpf --help per pi opzioni"
 
-#~ msgid "no full media list was found"
-#~ msgstr "non �stata trovata una lista completa dei supporti"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "copio la source list di \"%s\"..."
 
diff --git a/po/ja.po b/po/ja.po
index 6ba43f33..aa54e5bd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-11-19 14:43+0100\n"
 "Last-Translator: UTUMI Hirosi <utuhiro@mx12.freecom.ne.jp>\n"
 "Language-Team: Japanese\n"
@@ -37,1869 +37,1914 @@ msgstr "YyＹｙはハ"
 msgid "Nn"
 msgstr "NnＮｎいイ"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s をインストール\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr "指定されたパッケージ(%s)をインストールしています..\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdbを開けません"
+msgid "Is this OK?"
+msgstr "よろしいですか？"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - このヘルプを表示\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s をインストールするには次のパッケージのいずれかが必要です:"
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: ../urpm.pm:1
+# ｙ
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s を削除"
+msgid " (Y/n) "
+msgstr " (Y/n)[デフォルトはY] "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "「%s」"
+msgid "%s: command not found\n"
+msgstr "%s: コマンドが見つかりません\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "すべて既にインストールされています"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - このヘルプを表示\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ヘッダのキャッシュディレクトリを空にする\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - 利用できるパッケージを表示\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:79
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "どれを選びますか？(1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "プロトコルを操作できません: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d のヘッダをキャッシュから検出"
+msgid "syntax error in config file at line %s"
+msgstr "設定ファイルの%s行でsyntax error"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "%s という名のRPMファイルは複数あります"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
+"ます"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
+"ます"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "RPMファイル[%s]を検索中.."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list available parallel aliases.\n"
+#: ../urpm.pm:209
+#, fuzzy, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "検索に失敗: %s"
+#: ../urpm.pm:213
+#, fuzzy, c-format
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\"のリストファイルを調べられません。無視します。"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "%s のhdlistにアクセスできません。メディアを無視します"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "%s のリストにアクセスできません。メディアを無視します"
+
+#: ../urpm.pm:249
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "「%s」を作成することができませんでした\n"
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
+"メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
+"ます"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
+"ます"
+
+#: ../urpm.pm:271
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
+
+#: ../urpm.pm:278
 #, c-format
-msgid "Package installation..."
-msgstr "パッケージをインストール.."
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "%s のリストが見つかりません。メディアを無視します"
+
+#: ../urpm.pm:301
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "[%s]は無効なRPMファイル名です"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\"のリストファイルを調べられません。無視します。"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "リムーバブルメディア %s にはマウントポイントが多すぎます"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d インストールに失敗"
+msgid "taking removable device as \"%s\""
+msgstr "リムーバブルデバイスを %s と認識します"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:347
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
-"最初のインストール用メディアにアクセスできません(Mandrake/base/hdlists があり"
-"ません)"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:352 ../urpm.pm:355
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "「%s」を作成することができませんでした\n"
+
+#: ../urpm.pm:368
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "有効な選択ではありません。もう一度お願いします\n"
+msgid "unable to write config file [%s]"
+msgstr "設定ファイル[%s]を作成できません"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "write config file [%s]"
+msgstr "設定ファイル[%s]を作成"
 
-#: ../urpmf:1
+#: ../urpm.pm:402
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s には以下のようなものがあります: %s"
+#: ../urpm.pm:412
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "インストールに失敗しました"
+msgid "examining parallel handler in file [%s]"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - Xインタフェースを使う\n"
+#: ../urpm.pm:433
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "次のパッケージのいずれかが必要です:"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpme:1
-#, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "依存を満たすために以下のパッケージを削除します(%d MB)"
+#: ../urpm.pm:441
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr "  --best-output  - X/テキストのうち最適なインタフェースを使う\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "パッケージ `%s'をダウンロード.."
+msgid "examining synthesis file [%s]"
+msgstr "synthesisファイル[%s]を調査"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "examining hdlist file [%s]"
+msgstr "hdlistファイル[%s]を調査"
+
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
+"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
+"ます"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自動的にパッケージを選択して更新\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "メディア\"%s\"のhdlist/synthesisファイルを読み込み中に問題が発生"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "no package named %s"
-msgstr "%s というパッケージはありません"
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:563
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+msgid "skipping package %s"
+msgstr "パッケージ %s をスキップ"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "%s を削除できません"
+
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "unable to open rpmdb"
+msgstr "rpmdbを開けません"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"使いかた: urpmi.removemedia [-a] <メディア名> ...\n"
-"<メディア名>は削除するメディア名\n"
+msgid "medium \"%s\" already exists"
+msgstr "メディア %s は既に存在しています"
 
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "virtual medium need to be local"
 msgstr ""
-"インストールを続けられません。更新するには以下のパッケージを\n"
-"削除しなければなりません:\n"
-"%s\n"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "「with ...」以降の指定が ftp については必要です\n"
+#: ../urpm.pm:661
+#, c-format
+msgid "added medium %s"
+msgstr "メディア %s を追加"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - 利用できるパッケージを表示\n"
+#: ../urpm.pm:677
+#, c-format
+msgid "unable to access first installation medium"
+msgstr "最初のインストール用メディアにアクセスできません"
 
-#: ../urpme:1
+#: ../urpm.pm:681
 #, c-format
-msgid "unknown package"
-msgstr "不明なパッケージ"
+msgid "copying hdlists file..."
+msgstr "hdlistファイルをコピー中.."
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "Installation is possible"
-msgstr "インストールは可能です"
+msgid "...copying failed"
+msgstr "..コピー失敗"
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"更新するには以下のパッケージを削除します:\n"
-"%s"
+msgid "...copying done"
+msgstr "..コピー完了"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
 msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "依存を満たすために以下のパッケージをインストールします(%d MB)"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"最初のインストール用メディアにアクセスできません(Mandrake/base/hdlists があり"
+"ません)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "retrieving hdlists file..."
 msgstr "「%s」を作成することができませんでした\n"
 
-# ｙ
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N)[デフォルトはN] "
+msgid "...retrieving done"
+msgstr "..検索完了"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+msgid "...retrieving failed: %s"
+msgstr "検索に失敗: %s"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 詳細モード。\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlistファイルの説明 %s は無効です"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid "Initializing..."
-msgstr "初期化中.."
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "\"%s\" というメディアは存在しません"
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 利用できるパッケージを表示\n"
+msgid "selecting multiple media: %s"
+msgstr "複数の種類のメディアを選択: %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr ""
+msgid "\"%s\""
+msgstr "「%s」"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "メディア %s はリムーバブルだと判断しましたが、不確実です"
+msgid "removing medium \"%s\""
+msgstr "メディア %s を削除"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+
+#: ../urpm.pm:996
 #, fuzzy, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 "メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
 "ます"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "コピーしたhdlist/synthesisのmd5sumを計算"
+msgid "copying description file of \"%s\"..."
+msgstr "%s の説明ファイルをコピー中.."
 
-#: ../urpmi:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - 除外するパスを指定\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "既存のhdlist/synthesisのmd5sumを計算"
 
-#: ../urpmi:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "準備ができましたらEnterを押してください"
+msgid "examining MD5SUM file"
+msgstr "MD5SUMファイルを検査"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"不明なオプション '%s'\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "%s のhdlist(またはsynthesis)をコピー中.."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --split-level  - 一定数以上を更新するときは分割して行う。デフォルトは %d\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "メディア\"%s\"のhdlist/synthesisファイルを読み込み中に問題が発生"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "コピーしたhdlist/synthesisのmd5sumを計算"
+
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s]のコピーに失敗"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "メディア %s のsynthesisファイルを読み込み中に問題が発生"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "[%s] からRPMファイルを読み込む"
 
-#: ../urpmq:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s] からRPMファイルを読み込むことができません: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "hdlist[%s]を作成"
+msgid "no rpm files found from [%s]"
+msgstr "%s にはRPMファイルがありません"
+
+#: ../urpm.pm:1333
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "「%s」を作成することができませんでした\n"
+
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "「%s」を作成することができませんでした\n"
+
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "%s のhdlist(またはsynthesis)をコピー中.."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
+msgid "md5sum mismatch"
+msgstr "md5sumが合いません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUMファイルを検査"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: コマンドが見つかりません\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "メディア %s にはhdlistファイルがありません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "unable to register rpm file"
-msgstr "RPMファイルを登録できません"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "ファイル [%s] は同じメディア %s で既に使われています"
+
+#: ../urpm.pm:1541
+#, fuzzy, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr "  --allow-nodeps - 依存性を確認せずにインストール\n"
+msgid "unable to write list file of \"%s\""
+msgstr "%s のリストファイルを作成できません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "プロトコルを操作できません: %s"
+msgid "writing list file for medium \"%s\""
+msgstr "メディア %s のリストファイルを作成"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, fuzzy, c-format
-msgid "retrieving hdlists file..."
+msgid "nothing written in list file for \"%s\""
 msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr "メディア %s を追加"
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "%s のリストファイルを作成できません"
+
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "%s のリストファイルを作成できません"
 
-#: ../urpmi:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - 使われないrpmをキャッシュに保持\n"
+msgid "reading headers from medium \"%s\""
+msgstr "メディア %s のヘッダを読み込み"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "building hdlist [%s]"
+msgstr "hdlist[%s]を作成"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sumが合いません"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "メディア %s のhdlist synthesisファイルを作成"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "設定ファイルの%s行でsyntax error"
+msgid "found %d headers in cache"
+msgstr "%d のヘッダをキャッシュから検出"
 
-#: ../urpmi:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
-"  コマンドラインで指定したパッケージ名/rpmファイルをインストールします\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
+msgid "mounting %s"
+msgstr "%s をマウント"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "in order to install %s"
-msgstr "%s をインストールするには"
+msgid "unmounting %s"
+msgstr "%s をアンマウント"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s を削除できません"
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "「%s」を作成することができませんでした\n"
+msgid "invalid rpm file name [%s]"
+msgstr "[%s]は無効なRPMファイル名です"
 
-#: ../urpmf:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "RPMファイル[%s]を検索中.."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "RPMファイル[%s]にアクセスできません"
 
-#: ../urpmq:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - 名前, バージョン, リリース番号を表示\n"
+msgid "unable to register rpm file"
+msgstr "RPMファイルを登録できません"
 
-#: ../urpmf:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
+msgid "error registering local packages"
+msgstr "ローカルパッケージを登録中にエラーが発生"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "メディア %s は既に存在しています"
+msgid "no package named %s"
+msgstr "%s というパッケージはありません"
 
-#: ../_irpm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "installing %s\n"
-msgstr "%s をインストール\n"
+msgid "The following packages contain %s: %s"
+msgstr "%s には以下のようなものがあります: %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"アップデート対象が見つかりません\n"
-"(%s の中のいずれか)\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "%s という名のRPMファイルは複数あります"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "削除するものはありません"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
+#, fuzzy, c-format
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"メディア %s は無効なリストファイルを含んでいます(おそらく更新されていません。"
+"別の方法を試してください)。"
+
+#: ../urpm.pm:2366
 #, c-format
-msgid "unable to remove package %s"
-msgstr "%s を削除できません"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "メディア %s にはRPMファイルの所在が定義されていません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "メディア %s のsynthesisファイルを読み込み中に問題が発生"
+msgid "package %s is not found."
+msgstr "パッケージ %s は見つかりません"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"削除対象が見つかりません\n"
-"(%s の中のいずれか)\n"
+msgid "urpmi database locked"
+msgstr "urpmiのデータベースがロックされています"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - 全メディアを選択\n"
+msgid "medium \"%s\" is not selected"
+msgstr "メディア %s は選択されていません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPMファイル[%s]をメディア[%s]から読むことができません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s] からRPMファイルを読み込むことができません: %s"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "メディア %s はリムーバブルだと判断しましたが、不確実です"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+msgid "unable to access medium \"%s\""
+msgstr "メディア %s にアクセスできません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "不正な入力: [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - メディアを更新\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "メディア %s からRPMファイルを検索中.."
 
-# ｙ
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n)[デフォルトはY] "
+msgid "Preparing..."
+msgstr "準備.."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
-"ます"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "malformed input: [%s]"
-msgstr "不正な入力: [%s]"
+#: ../urpm.pm:2786
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpme:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s を削除するとシステムが壊れます"
+msgid "removing package %s"
+msgstr "%s を削除"
 
-#: ../urpmq:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - 利用できるメディアを表示\n"
+msgid "unable to remove package %s"
+msgstr "%s を削除できません"
 
-#: ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
-"インストールできないパッケージがあります:\n"
-"%s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "パッケージ `%s'(%s/%s)をインストール中"
+msgid "unable to install package %s"
+msgstr "%s をインストールできません"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "due to missing %s"
+msgstr "%s がない"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - ソースのみをインストール(バイナリなし)\n"
+msgid "due to unsatisfied %s"
+msgstr "依存を満たす %s がない"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+#: ../urpm.pm:3011
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "削除するものはありません"
+
+#: ../urpm.pm:3012
+#, fuzzy, c-format
+msgid "in order to keep %s"
 msgstr ""
+"ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: ../urpmf:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "in order to install %s"
+msgstr "%s をインストールするには"
+
+#: ../urpm.pm:3047
+#, c-format
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "do you agree ?"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+#: ../urpm.pm:3065
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "無効な署名(%s)"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "...retrieving done"
-msgstr "..検索完了"
+msgid "Invalid Key ID (%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "skipping package %s"
-msgstr "パッケージ %s をスキップ"
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "無効な署名(%s)"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPMファイル(%s)を読むことが出来ませんでした\n"
 
-#: ../urpmq:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "コマンドラインで指定したパッケージ名/rpmファイルがあるか調べます\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "有効な選択ではありません。もう一度お願いします\n"
 
-#: ../urpmi:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"urpmi version %s\n"
+"urpme version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpmi version %s\n"
+"urpme version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
 "\n"
 "使いかた:\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "「%s」を作成することができませんでした\n"
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - このヘルプを表示\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 指定したメディアは使わない(コンマで区切る)\n"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自動的にパッケージを選択\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+#: ../urpme:43 ../urpmi:124
+#, c-format
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - インストールが正しく行われるか確かめる\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
+#, c-format
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 依存を無視して強制する\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
-"ます"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 詳細モード。\n"
 
-#: ../urpmi:1
+#: ../urpme:50
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
-"ます"
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
-msgstr "準備.."
-
-#: ../rpm-find-leaves:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - 利用できるパッケージを表示\n"
+msgid "unknown packages"
+msgstr "%s というパッケージはありません\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr ""
+msgid "unknown package"
+msgstr "不明なパッケージ"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:93
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 既存のsynthesis/hdlistファイルを使わない\n"
+msgid "removing package %s will break your system"
+msgstr "%s を削除するとシステムが壊れます"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:95
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+msgid "Nothing to remove"
+msgstr "削除するものはありません"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s]のコピーに失敗"
-
-#: ../urpmq:1
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Checking to remove the following packages"
+msgstr "次のパッケージのいずれかが必要です:"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:106
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "依存を満たすために以下のパッケージを削除します(%d MB)"
 
-#: ../urpmi:1
+# ｙ
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - 処理前にキャッシュからrpmを削除\n"
+msgid " (y/N) "
+msgstr " (y/N)[デフォルトはN] "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
+msgid "removing %s"
+msgstr "%s を削除"
 
-#: ../urpmf:1
+#: ../urpme:115
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
+msgid "Removing failed"
+msgstr "削除失敗"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
 #, fuzzy, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"メディア %s はすでに使われたhdlistを使おうとしています。このメディアを無視し"
-"ます"
-
-#: ../urpme:1
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
 "これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
 "\n"
 "使いかた:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"使いかた: urpmi.addmedia [オプション] <メディア名> <url> [<相対パス>]\n"
-"<url>は以下を選択\n"
-"       file://<パス>\n"
-"       ftp://<login>:<password>@<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
-"       ftp://<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
-"       http://<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
-"       removable://<パス>\n"
-"\n"
-"[オプション]は以下を選択\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 更新したメディアのみを使う\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "%s のhdlist(またはsynthesis)をコピー中.."
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 指定したメディアのみを使う(コンマで区切る)\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "...copying done"
-msgstr "..コピー完了"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 指定したメディアは使わない(コンマで区切る)\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"メディア %s は無効なリストファイルを含んでいます(おそらく更新されていません。"
-"別の方法を試してください)。"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "最初のインストール用メディアにアクセスできません"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "error registering local packages"
-msgstr "ローカルパッケージを登録中にエラーが発生"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - ダウンロード速度を制限\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "「%s」を作成することができませんでした\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "%s にはRPMファイルがありません"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "「%s」を作成することができませんでした\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:44
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "以下のパッケージは署名が間違っています"
+msgid "  --size         - print tag size: size.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "既存のhdlist/synthesisのmd5sumを計算"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s をインストールできません"
+msgid "  --description  - print tag description: description.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr "  --allow-force  - パッケージの完全性と依存性を確認しない\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:49
 #, c-format
-msgid "Save file"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPMファイル(%s)を読むことが出来ませんでした\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "設定ファイル[%s]を作成できません"
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:52
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:54
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 依存を無視して強制する\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "「%s」を作成することができませんでした\n"
+msgid "  --files        - print tag files: all files.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:55
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - 既存のsynthesisファイルを使わない\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
-"  --synthesis    - urpmiのデータベースではなく指定したsynthesisを使う\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "「<relative path of hdlist>」部分の指定がありません\n"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "次のパッケージのいずれかが必要です:"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "unrequested"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
+"  -f             - 名前, バージョン, リリース番号, アーキテクチャを表示\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:61
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "RPMファイル[%s]にアクセスできません"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:62
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "「%s」を作成することができませんでした\n"
-
-#: ../urpmi:1
+#: ../urpmf:63
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "インストールを続けますか？"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:64
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPMファイル[%s]をメディア[%s]から読むことができません"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "メディア %s のhdlist synthesisファイルを作成"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - 読みやすい形で情報を表示\n"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:114
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:72
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
+"\n"
+"使いかた:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
+"  --synthesis    - urpmiのデータベースではなく指定したsynthesisを使う\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "unmounting %s"
-msgstr "%s をアンマウント"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自動的にパッケージを選択して更新\n"
 
-#: ../urpmi.update:1
+#: ../urpmi:85
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"アップデートが必要なものはありません。\n"
-"メディアを追加する場合は urpmi.addmedia を使用して下さい。\n"
+"  --no-uninstall - パッケージを削除する必要があるときはインストール中止\n"
 
-#: ../urpmi:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr "  --keep         - 既存のパッケージを維持し、削除要求は拒否する\n"
+
+#: ../urpmi:88
+#, c-format
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
+"  --split-level  - 一定数以上を更新するときは分割して行う。デフォルトは %d\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "restarting urpmi"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "synthesisファイル[%s]を調査"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - ファジー検索(-yと同じ)\n"
 
-#: ../urpmi:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "再度インストールを試みますか？(--force) (y/N)[デフォルトはN]"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - ソースパッケージを指定(-s と同じ)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "...copying failed"
-msgstr "..コピー失敗"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - ソースのみをインストール(バイナリなし)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "%s のhdlistにアクセスできません。メディアを無視します"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - 処理前にキャッシュからrpmを削除\n"
 
-#: ../urpmi:1
+#: ../urpmi:96
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr ""
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - 使われないrpmをキャッシュに保持\n"
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr ""
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr "  --allow-nodeps - 依存性を確認せずにインストール\n"
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr "  --allow-force  - パッケージの完全性と依存性を確認しない\n"
 
-#: ../urpmq:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "%s というパッケージはありません\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "複数の種類のメディアを選択: %s"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -f             - 名前, バージョン, リリース番号, アーキテクチャを表示\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "ファイル [%s] は同じメディア %s で既に使われています"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - ダウンロード速度を制限\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:109
+#, fuzzy, c-format
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
+
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"\"削除が必要なものはありません。\\n\"\n"
-"\"メディアを追加する場合は urpmi.addmedia を使用して下さい。\\n\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "%s のリストが見つかりません。メディアを無視します"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:115
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - このヘルプを表示\n"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr "  --bug          - 指定したディレクトリにバグレポートを出力\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "「%s」を作成することができませんでした\n"
+#: ../urpmi:119
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - Xインタフェースを使う\n"
 
-#: ../urpmf:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
-msgstr ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr "  --best-output  - X/テキストのうち最適なインタフェースを使う\n"
 
-#: ../urpmq:1
+#: ../urpmi:122
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr ""
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
 
-#: ../urpmf:1
+#: ../urpmi:125
 #, 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 version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
-"\n"
-"使いかた:\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - 除外するパスを指定\n"
 
-#: ../urpmf:1
+#: ../urpmi:126
 #, c-format
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "Is this OK?"
-msgstr "よろしいですか？"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ファジー検索(--fuzzyと同じ)\n"
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr ""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - ソースパッケージを指定(--src と同じ)\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "「%s」を作成することができませんでした\n"
-
-#: ../urpme:1
+#: ../urpmi:134
 #, c-format
-msgid "Nothing to remove"
-msgstr "削除するものはありません"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "%s のリストファイルを作成できません"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  コマンドラインで指定したパッケージ名/rpmファイルをインストールします\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "メディア %s のヘッダを読み込み"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:197
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr "  --bug          - 指定したディレクトリにバグレポートを出力\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "メディア %s にはRPMファイルの所在が定義されていません"
+msgid "Do nothing"
+msgstr "なにもしない"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "%s のリストファイルを作成できません"
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "インストールに失敗しました"
+
+#: ../urpmi:239
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "\"%s\" というメディアは存在しません"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:240
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
 msgid "Copying failed"
 msgstr "コピー失敗"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlistファイルの生成を強制\n"
-
-#: ../urpmq:1
-#, c-format
-msgid "--list-nodes can only be used with --parallel"
+#: ../urpmi:260
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
+"ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "メディア %s にはhdlistファイルがありません"
+msgid "One of the following packages is needed:"
+msgstr "次のパッケージのいずれかが必要です:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - ソースパッケージを指定(--src と同じ)\n"
+msgid "What is your choice? (1-%d) "
+msgstr "どれを選びますか？(1-%d) "
 
-#: ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "installing %s"
-msgstr "%s をインストール"
+msgid "Package installation..."
+msgstr "パッケージをインストール.."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s] からRPMファイルを読み込む"
+msgid "Initializing..."
+msgstr "初期化中.."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "%s の説明ファイルをコピー中.."
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"インストールできないパッケージがあります:\n"
+"%s"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自動的にパッケージを選択\n"
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:455
 #, c-format
-msgid "Removing failed"
-msgstr "削除失敗"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"インストールを続けられません。更新するには以下のパッケージを\n"
+"削除しなければなりません:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"更新するには以下のパッケージを削除します:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "パッケージ %s は見つかりません"
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "依存を満たすために以下のパッケージをインストールします(%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "メディア %s を削除"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "--distrib に <relative path of hdlist> は必要ありません"
+msgid "unable to get source packages, aborting"
+msgstr "ソースパッケージを取得できませんでした。このまま終了します"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "Cancel"
-msgstr "キャンセル"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "メディア(%s)を %s に挿入して下さい。"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - ソースパッケージを指定(-s と同じ)\n"
+msgid "Press Enter when ready..."
+msgstr "準備ができましたらEnterを押してください"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "パッケージ `%s'をダウンロード.."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:597
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "メディア %s にアクセスできません"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:619
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "「%s」を作成することができませんでした\n"
+msgid "The following packages have bad signatures"
+msgstr "以下のパッケージは署名が間違っています"
 
-#: ../urpmf:1
+#: ../urpmi:620
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr ""
+msgid "Do you want to continue installation ?"
+msgstr "インストールを続けますか？"
 
-#: ../urpmq:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "インストールに失敗しました"
 
-#: ../urpmq:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --help         - このヘルプを表示\n"
+msgid "distributing %s"
+msgstr "%s をインストール中…\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "%s のリストにアクセスできません。メディアを無視します"
+msgid "installing %s"
+msgstr "%s をインストール"
 
-#: ../urpmf:1
+#: ../urpmi:688
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "パッケージ `%s'(%s/%s)をインストール中"
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "hdlistファイル[%s]を調査"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "再度インストールを試みますか？(--force) (y/N)[デフォルトはN]"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlistファイルをコピー中.."
+msgid "%d installation transactions failed"
+msgstr "%d インストールに失敗"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "メディア %s のリストファイルを作成"
+msgid "Installation is possible"
+msgstr "インストールは可能です"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "すべて既にインストールされています"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"メディア %s はすでに使われたリストを使おうとしています。このメディアを無視し"
-"ます"
+"使いかた: urpmi.addmedia [オプション] <メディア名> <url> [<相対パス>]\n"
+"<url>は以下を選択\n"
+"       file://<パス>\n"
+"       ftp://<login>:<password>@<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
+"       ftp://<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
+"       http://<ホスト>/<パス> <hdlistの相対的ファイル名>\n"
+"       removable://<パス>\n"
+"\n"
+"[オプション]は以下を選択\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "Do nothing"
-msgstr "なにもしない"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - 既存のsynthesisファイルを使わない\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - 既存のhdlistファイルを使わない\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "mounting %s"
-msgstr "%s をマウント"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - 既存のsynthesis/hdlistファイルを使わない\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ソースパッケージを取得できませんでした。このまま終了します"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "%s のhdlist(またはsynthesis)をコピー中.."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "%s のリストファイルを作成できません"
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - パッケージを削除する必要があるときはインストール中止\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
-"\n"
-"使いかた:\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - グループと名前を表示\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "メディア %s は選択されていません"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ヘッダのキャッシュディレクトリを空にする\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr ""
-"ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlistファイルの生成を強制\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "アップデートを「%s」について行なうことができませんでした\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "--distrib に <relative path of hdlist> は必要ありません"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "アップデートを「%s」について行なうことができませんでした\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "リムーバブルメディア %s にはマウントポイントが多すぎます"
+msgid "<relative path of hdlist> missing\n"
+msgstr "「<relative path of hdlist>」部分の指定がありません\n"
+
+#: ../urpmi.addmedia:192
+#, fuzzy, c-format
+msgid "`with' missing for network media\n"
+msgstr "「with ...」以降の指定が ftp については必要です\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
+msgid "unable to create medium \"%s\"\n"
+msgstr "「%s」を作成することができませんでした\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"使いかた: urpmi.removemedia [-a] <メディア名> ...\n"
+"<メディア名>は削除するメディア名\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr ""
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - 全メディアを選択\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 指定したメディアのみを使う(コンマで区切る)\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "「%s」を作成することができませんでした\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"不明なオプション '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "メディア %s からRPMファイルを検索中.."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"\"削除が必要なものはありません。\\n\"\n"
+"\"メディアを追加する場合は urpmi.addmedia を使用して下さい。\\n\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"削除対象が見つかりません\n"
+"(%s の中のいずれか)\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s をインストール中…\n"
+#: ../urpmi.update:28
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"使いかた: urpmi.update [オプション] <メディア名> ...\n"
+"<メディア名>は更新するメディア名\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "インストールに失敗しました"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - メディアを更新\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "設定ファイル[%s]を作成"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"アップデートが必要なものはありません。\n"
+"メディアを追加する場合は urpmi.addmedia を使用して下さい。\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"アップデート対象が見つかりません\n"
+"(%s の中のいずれか)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
+"\n"
+"使いかた:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "メディア(%s)を %s に挿入して下さい。"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 利用できるパッケージを表示\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - 利用できるメディアを表示\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - 利用できるメディアを表示\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ファジー検索(--fuzzyと同じ)\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlistファイルの説明 %s は無効です"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list available parallel aliases.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "%s を削除"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr ""
-"ローカルパッケージのインストールはスーパーユーザーでなくてはできません。"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --help         - このヘルプを表示\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "依存を満たす %s がない"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr "指定されたパッケージ(%s)をインストールしています..\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - 新しい版がインストールされているときはパッケージを削除\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmiのデータベースがロックされています"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr "  --verify-rpm   - rpmを照合(=デフォルト。--no-verify-rpm で無効)\n"
+#: ../urpmq:82
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "「%s」を作成することができませんでした\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - 読みやすい形で情報を表示\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - グループと名前を表示\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:87
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "リムーバブルデバイスを %s と認識します"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - 名前, バージョン, リリース番号を表示\n"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - 利用できるパッケージを表示\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - ファジー検索(-yと同じ)\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "コマンドラインで指定したパッケージ名/rpmファイルがあるか調べます\n"
 
-#: ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
-"  -u             - 新しい版がインストールされているときはパッケージを削除\n"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - 既存のhdlistファイルを使わない\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "%s がない"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 更新したメディアのみを使う\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "完全なメディアリストはありません"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"使いかた: urpmi.update [オプション] <メディア名> ...\n"
-"<メディア名>は更新するメディア名\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "「%s」を作成することができませんでした\n"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s をインストールするには次のパッケージのいずれかが必要です:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - インストールが正しく行われるか確かめる\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "これはフリーソフトウェアであり、GNU GPLの条件のもとで再配布できます。\n"
+#~ "\n"
+#~ "使いかた:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "不明なwebfetch %s\n"
@@ -1988,9 +2033,6 @@ msgstr "  --test         - インストールが正しく行われるか確か�
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "オプションの詳細は「urpmf --help」でご確認ください"
 
-#~ msgid "no full media list was found"
-#~ msgstr "完全なメディアリストはありません"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "%s のデータベースをコピー中.."
 
diff --git a/po/ka.po b/po/ka.po
index f2209338..90225e1d 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-01-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -36,1830 +36,1862 @@ msgstr "yYkKxXხ"
 msgid "Nn"
 msgstr "nNaAა"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "ვაინსტალირებ: %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"პაკეტების ავტპმატური ინსტალაცია...\n"
+"თქვენ მოინდომეთ %s პაკეტის ინსტალირება\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr ""
+msgid "Is this OK?"
+msgstr "თანახმა ხართ?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr ""
+msgid "Ok"
+msgstr "ო-ქეი"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+#: ../_irpm:36 ../urpm/msg.pm:41
+#, c-format
+msgid "Cancel"
+msgstr "გამოქცევა"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (ხ/ა) [ხ] "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: ბრძანება ვერ ვიპოვე\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "უკვე ყველაფერი ჩაწერილია"
+msgid "   -h|--help      - print this help message.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
+
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "თქვენი არჩევანი? (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
+msgid "syntax error in config file at line %s"
+msgstr "სინტაქსური შეცდომა საკონფიგურაციო ფაილში. სტრიქონი: %s"
+
+#: ../urpm.pm:174
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
+"ეთქვა"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"ვერ ვუმკლავდები მედიუმს \"%s\", ვინაიდან list ფაილს უკვე სხვა მედიუმი იყენებს"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"ვერ გამოვიყენებ სახელს \"%s\" უსახელპო მედიასათვის, რადგან იგი უკვე "
+"გამოყენებულია"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ვიძახებ hdlists ფაილს..."
+#: ../urpm.pm:209
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ვერ ვითვალისწინებ მედიას \"%s\" რადგან list ფაილი [%s] არ არსებობს"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ვერ დავადგინე მედია ამ hdlist ფაილისთვის [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...გამოძახება ჩაიშალა: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ვერ ვამოწმებ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ვერ ვუკავშირდები list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
+"ეთქვა"
 
-#: ../urpmi:1
-#, c-format
-msgid "Package installation..."
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr ""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ვერ ვპოულობ hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ვერ ვპოულობ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე Mandrake/base/hdlists "
-"ფაილს)"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ვერ ვამოწმებ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "ძალიან ბევრი mount სახელი შეცვლადი  მედიუმისათვის \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "taking removable device as \"%s\""
+msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr ""
+msgid "using different removable device [%s] for \"%s\""
+msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
 
-#: ../urpm.pm:1 ../urpme:1
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
+#: ../urpm.pm:352 ../urpm.pm:355
+#, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../urpm.pm:368
+#, c-format
+msgid "unable to write config file [%s]"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "write config file [%s]"
+msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
+
+#: ../urpm.pm:402
+#, c-format
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+#: ../urpm.pm:423
+#, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "ვამოწმებ პარალელურ სათავეს ფაილში [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+msgid "found parallel handler for nodes: %s"
+msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "ვიყენებ მიმაგრებულ მედიას პარალელური რეჟიმისათვის: %s"
+
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
+
+#: ../urpm.pm:452
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+"--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
+"პარამეტრებთან ერთად"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "examining synthesis file [%s]"
+msgstr "ვამოწმებ synthesis ფაილს [%s]"
+
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
+
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
+"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
+
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
+#, fuzzy, c-format
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "no package named %s"
+msgid "skipping package %s"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -a             - select all matches on command line.\n"
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
+msgid "medium \"%s\" already exists"
+msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:661
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr ""
+msgid "added medium %s"
+msgstr "დამატებული მედიუმი %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown package"
-msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "hdlists ფაილის კოპირება..."
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "ინსტალაცია ჩაიშალა"
+msgid "...copying failed"
+msgstr "...კოპირება დასრულდა"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...კოპირება დასრულდა"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
 msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე Mandrake/base/hdlists "
+"ფაილს)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ვერ ვითვალისწინებ მედიას \"%s\" რადგან list ფაილი [%s] არ არსებობს"
+msgid "retrieving hdlists file..."
+msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (ხ/ა) [ხ] "
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
+#, c-format
+msgid "...retrieving done"
+msgstr "...გამოძახება დასრულდა"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+msgid "...retrieving failed: %s"
+msgstr "...გამოძახება ჩაიშალა: %s"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "არასწორი hdlist აღწერილობა \"%s\" hdlists-ის ფაილში"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "ვცდილობ არარსებული მედიუმის ამორჩევას \"%s\""
+
+#: ../urpm.pm:767
 #, c-format
-msgid "Initializing..."
-msgstr "მიმდინარეობს ინიციალიზაცია..."
+msgid "selecting multiple media: %s"
+msgstr "ვირჩევ მრავალ მედიას: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr ""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, fuzzy, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
 "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
 "ეთქვა"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+#: ../urpm.pm:1038 ../urpm.pm:1278
+#, fuzzy, c-format
+msgid "examining MD5SUM file"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+#: ../urpm.pm:1109
+#, fuzzy, c-format
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "...კოპირება ჩაიშალა"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
+
+#: ../urpm.pm:1199
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1333
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+
+#: ../urpm.pm:1398
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, fuzzy, c-format
-msgid "building hdlist [%s]"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+
+#: ../urpm.pm:1490
+#, fuzzy, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, fuzzy, c-format
-msgid "examining MD5SUM file"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ბრძანება ვერ ვიპოვე\n"
+#: ../urpm.pm:1579
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "unable to register rpm file"
+msgid "writing list file for medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm.pm:1588
+#, fuzzy, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+
+#: ../urpm.pm:1679
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm.pm:1684
+#, fuzzy, c-format
+msgid "building hdlist [%s]"
+msgstr "ვამოწმებ hdlist ფაილს [%s]"
+
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ვერ ვუმკლავდები პროტოკოლს: %s"
+msgid "removing %d obsolete headers in cache"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "ვიძახებ hdlists ფაილს..."
+#: ../urpm.pm:1893
+#, fuzzy, c-format
+msgid "mounting %s"
+msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "Yes, really install it"
+msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "added medium %s"
-msgstr "დამატებული მედიუმი %s"
+msgid "relocated %s entries in depslist"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "ვიძახებ hdlists ფაილს..."
+
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "md5sum mismatch"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr "სინტაქსური შეცდომა საკონფიგურაციო ფაილში. სტრიქონი: %s"
+#: ../urpm.pm:1960
+#, fuzzy, c-format
+msgid "unable to register rpm file"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2076
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+
+#: ../urpm.pm:2079 ../urpme:88
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s შედმეგ პაკეტებშია: %s\n"
+
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, c-format
+msgid "urpmi database locked"
+msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
+
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
+msgid "medium \"%s\" is not selected"
+msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2553
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "ვიძახებ hdlists ფაილს..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  --url          - print tag url: url.\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s-ისთვის უცნობი პროტოკოლია განსაზღვრული"
+msgid "unable to access medium \"%s\""
+msgstr "ვერ ვუკავშირდები მედიას \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
+#: ../urpm.pm:2642
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "მედიუმი \"%s\" უკვე არსებობს"
+msgid "Preparing..."
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "installing %s\n"
-msgstr "ვაინსტალირებ: %s\n"
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to promote %s"
+#: ../urpm.pm:2786
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+
+#: ../urpm.pm:2794
+#, fuzzy, c-format
+msgid "removing package %s"
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr ""
+
+#: ../urpm.pm:2809
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Missing signature (%s)"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid "in order to keep %s"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+#: ../urpm.pm:3035
+#, fuzzy, c-format
+msgid "in order to install %s"
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:3065
 #, c-format
-msgid " (Y/n) "
-msgstr " (ხ/ა) [ხ] "
+msgid "Invalid signature (%s)"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "Missing signature (%s)"
 msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "malformed input: [%s]"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "removing package %s will break your system"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
 
-#: ../urpmi:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
+msgid "  --help         - print this help message.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "do you agree ?"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "არასწორი list ფაილის \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "...retrieving done"
-msgstr "...გამოძახება დასრულდა"
+msgid "  -v             - verbose mode.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid "skipping package %s"
+msgid "unknown packages"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "არც ერთ პაკეტს არ ქვია %s\n"
+
+#: ../urpme:93
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpme:95
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "Nothing to remove"
+msgstr ""
+
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
+
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (ხ/ა) [ხ] "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:27
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ვერ დავადგინე მედია ამ hdlist ფაილისთვის [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
-"ეთქვა"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "due to conflicts with %s"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:41
 #, c-format
-msgid "Preparing..."
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:42
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "ვიყენებ სხვანაირ შეცვლად მოწყობილობას [%s] \"%s\"-სთვის"
+msgid "  --group        - print tag group: group.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:44
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "...კოპირება ჩაიშალა"
-
-#: ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmf:47
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
-"ვერ გამოვიყენებ სახელს \"%s\" უსახელპო მედიასათვის, რადგან იგი უკვე "
-"გამოყენებულია"
 
-#: ../urpmf:1
+#: ../urpmf:50
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+#: ../urpmf:51
+#, c-format
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული hdlist. შედეგად უარი "
-"ეთქვა"
 
-#: ../urpme:1
+#: ../urpmf:52
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+#: ../urpmf:54
+#, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "...copying done"
-msgstr "...კოპირება დასრულდა"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:59
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:61
 #, c-format
-msgid "error registering local packages"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:62
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "%s შედმეგ პაკეტებშია: %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
+#: ../urpmf:64
+#, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:65
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "Save file"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:82
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ვერ ვიპოვე მდებარეობა შეცვლადი მედიუმისათვის \"%s\""
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:88
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unrequested"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:96
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ვერ ვშიფრავ \"%s\"-ს ფაილში [%s]"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:100
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-
-#: ../urpmi:1
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:115
 #, c-format
-msgid "unmounting %s"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi:119
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:120
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:122
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ვამოწმებ synthesis ფაილს [%s]"
-
-#: ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "...კოპირება დასრულდა"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ვერ ვუკავშირდები hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:128
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "არც ერთ პაკეტს არ ქვია %s\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "ვირჩევ მრავალ მედიას: %s"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:141
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ვერ ვპოულობ list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:204
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
+msgid "Do nothing"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid ""
-"callback is :\n"
-"%s\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, 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"
+"You are about to install the following software package on your computer:\n"
 "\n"
-"usage:\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "ინსტალაცია ჩაიშალა"
+
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:240
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+msgid "Copying failed"
+msgstr "კოპირება დასრულდა"
+
+#: ../urpmi:260
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
 msgstr ""
-"--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
-"პარამეტრებთან ერთად"
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:396
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr ""
+msgid "One of the following packages is needed:"
+msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "Is this OK?"
-msgstr "თანახმა ხართ?"
+msgid "What is your choice? (1-%d) "
+msgstr "თქვენი არჩევანი? (1-%d) "
 
-#: ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "Initializing..."
+msgstr "მიმდინარეობს ინიციალიზაცია..."
+
+#: ../urpmi:435
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ვამოწმებ პარალელურ სათავეს ფაილში [%s]"
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:455
 #, c-format
-msgid "Nothing to remove"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmq:1
-#, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr ""
+#: ../urpmi:540
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
+msgid "Press Enter when ready..."
+msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
 
-#: ../urpmf:1
-#, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
 msgstr ""
+"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
+"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "ვცდილობ არარსებული მედიუმის ამორჩევას \"%s\""
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:619
 #, fuzzy, c-format
-msgid "Copying failed"
-msgstr "კოპირება დასრულდა"
+msgid "The following packages have bad signatures"
+msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:620
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "installing %s"
+msgid "distributing %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "installing %s"
+msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:712
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
 
-#: ../urpme:1
+#: ../urpmi:731
 #, c-format
-msgid "Removing failed"
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
+
+#: ../urpmi:772
+#, fuzzy, c-format
+msgid "%d installation transactions failed"
+msgstr "ინსტალაცია ჩაიშალა"
+
+#: ../urpmi:780
+#, fuzzy, c-format
+msgid "Installation is possible"
+msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:783
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
+msgid "Everything already installed"
+msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "package %s is not found."
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "ვაგდებ მედიას \"%s\""
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "Cancel"
-msgstr "გამოქცევა"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ვერ ვუკავშირდები მედიას \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "  --changelog    - print changelog.\n"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ვერ ვუკავშირდები list ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
-
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "ვამოწმებ hdlist ფაილს [%s]"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlists ფაილის კოპირება..."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი ეთქვა"
+msgid "retrieving mirrors at %s ..."
+msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Do nothing"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "ვიყენებ მიმაგრებულ მედიას პარალელური რეჟიმისათვის: %s"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "mounting %s"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
-"ვერ ვუმკლავდები მედიუმს \"%s\", ვინაიდან list ფაილს უკვე სხვა მედიუმი იყენებს"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"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"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
-
-#: ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "მედიუმი \"%s\" უკვე არსებობს"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ვერ ვპოულობ hdlist ფაილს \"%s\"-სთვის, მედიუმი იგნორირებულ იქნა"
-
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "ძალიან ბევრი mount სახელი შეცვლადი  მედიუმისათვის \"%s\""
-
-#: ../urpmf:1
-#, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:41
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:75
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmi:1
+#: ../urpmq:38
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
-"What would you like to do?"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "ვაინსტალირებ: %s\n"
-
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Installation failed"
-msgstr "ინსტალაცია ჩაიშალა"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "write config file [%s]"
-msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:54
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:55
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:57
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:58
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:60
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "Ok"
-msgstr "ო-ქეი"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "არასწორი hdlist აღწერილობა \"%s\" hdlists-ის ფაილში"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:75
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
-"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
-"ჩაწეროს პაკეტები."
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"პაკეტების ავტპმატური ინსტალაცია...\n"
-"თქვენ მოინდომეთ %s პაკეტის ინსტალირება\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
-
-#: ../urpmi:1
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
+
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "უცნობი ვებცდა `%s' !!!\n"
 
diff --git a/po/ko.po b/po/ko.po
index 72feb41f..0695c863 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2001-09-22 03:14+0900\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -35,1828 +35,1859 @@ msgstr "Yy예"
 msgid "Nn"
 msgstr "Nn아니오"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s 설치 중...\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"팩키지 자동 설치...\n"
+"님은 팩키지 %s의 설치를 요청했습니다.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to open rpmdb"
-msgstr "RPM 파일을 등록할 수 없습니다."
-
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 이 도움말 출력.\n"
+msgid "Is this OK?"
+msgstr "계속할까요?"
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "다음 팩키지들 중 하나가 %s를 설치하는데 필요합니다:"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+msgid "Ok"
+msgstr "확인"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "Cancel"
+msgstr "취소"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr ""
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpmi:1
+#: ../_irpm:63
 #, c-format
-msgid "Everything already installed"
-msgstr "모든 것이 이미 설치되어 있습니다."
+msgid "%s: command not found\n"
+msgstr "%s: 명령어를 찾을 수 없습니다.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr ""
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - 이 도움말 출력.\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "어느 것을 선택하시겠습니까? (1-%d) "
-
-#: ../urpm.pm:1
-#, c-format
-msgid "found %d headers in cache"
-msgstr "캐쉬에서 %d 헤더를 찾았습니다."
-
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "동일한 파일 이름 「%s」를 가진 여러 개의 팩키지가 존재합니다."
+msgid "                    defaults is %s.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:57
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] 추출 중"
+msgid "unable to handle protocol: %s"
+msgstr "목록 파일을 생성할 수 없습니다: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr ""
+msgid "syntax error in config file at line %s"
+msgstr "설정 파일의 %s 줄에 문법 오류"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:174
 #, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "[%s] 추출 중"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpmf:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"목록 파일이 다른 매체에 의해 이미 사용되고 있기 때문에, 매체 「%s」를 사용할 "
+"수 없습니다."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Package installation..."
-msgstr "설치할 팩키지 준비 중..."
-
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "유효하지 않은 RPM 파일 이름 [%s]"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "매체 이름 「%s」을 사용할 수 없습니다. 벌써 사용 중입니다."
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
+"목록 파일 [%2$s]가 존재하지 않기 때문에, 매체「%1$s」을 처리할 수 없습니다."
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "설치 실패."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
-
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "선택이 잘못되었습니다. 다시 시도하세요.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "이 목록파일 [%s]의 매체를 결정할 수 없습니다."
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr ""
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:1 ../urpme:1
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
+#: ../urpm.pm:249
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "존재하지 않는 매체「%s」 선택 시도"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "설치 실패."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
+
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr ""
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "다음 팩키지들 중 하나가 필요합니다:"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpme:1
+#: ../urpm.pm:301
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
+#: ../urpm.pm:309
+#, fuzzy, c-format
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+msgid "too many mount points for removable medium \"%s\""
+msgstr "「%s」매체를 생성할 수 없습니다.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:347
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:352 ../urpm.pm:355
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "「%s」매체를 생성할 수 없습니다.\n"
+
+#: ../urpm.pm:368
 #, c-format
-msgid "no package named %s"
-msgstr "%s라는 팩키지는 없습니다."
+msgid "unable to write config file [%s]"
+msgstr "설정 파일 [%s]에 기록할 수 없습니다."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:390
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+msgid "write config file [%s]"
+msgstr "설정 파일 [%s]에 기록"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:412
 #, fuzzy, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"사용법: urpmi.removemedia [-a] <이름> ...\n"
-"<이름>은 제거할 매체명.\n"
-"   -a    모든 매체 선택.\n"
-"\n"
-"알 수 없는 옵션 「%s」\n"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, fuzzy, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "목록 파일 [%s] 읽는 중"
+
+#: ../urpm.pm:433
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "목록 파일 [%s] 읽는 중"
+
+#: ../urpm.pm:437
+#, c-format
+msgid "using associated media for parallel mode: %s"
 msgstr ""
-"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
-"되지 않습니다.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:441
 #, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "FTP 미디어에 대해 「with」가 빠져있습니다.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
 
-#: ../urpmq:1
+#: ../urpm.pm:452
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "[%s] 팩키지를 열 수 없습니다.\n"
+msgid "examining synthesis file [%s]"
+msgstr "의존목록 파일 [%s] 읽기"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "설치 실패."
+msgid "examining hdlist file [%s]"
+msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
-"되지 않습니다.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
-"목록 파일 [%2$s]가 존재하지 않기 때문에, 매체「%1$s」을 처리할 수 없습니다."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (Y/n) "
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr ""
+msgid "skipping package %s"
+msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi:1
-#, c-format
-msgid "Initializing..."
-msgstr "초기화..."
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
+#, fuzzy, c-format
+msgid "unable to open rpmdb"
+msgstr "RPM 파일을 등록할 수 없습니다."
 
-#: ../urpmq:1
+#: ../urpm.pm:622
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr ""
+msgid "medium \"%s\" already exists"
+msgstr "매체「%s」는 이미 존재합니다."
 
-#: ../urpmf:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+#: ../urpm.pm:661
+#, fuzzy, c-format
+msgid "added medium %s"
+msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:677
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
+msgid "unable to access first installation medium"
+msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:681
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+msgid "copying hdlists file..."
+msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "[%s] 추출 중"
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "다 되었으면 ENTER키를 누르세요..."
+msgid "...copying done"
+msgstr "[%s] 추출 중"
 
-#: ../urpmi.removemedia:1
-#, c-format
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, fuzzy, c-format
 msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+#: ../urpm.pm:691
+#, fuzzy, c-format
+msgid "retrieving hdlists file..."
+msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
+msgid "...retrieving done"
+msgstr "[%s] 추출 중"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
+#, fuzzy, c-format
+msgid "...retrieving failed: %s"
+msgstr "[%s] 추출 중"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "존재하지 않는 매체「%s」 선택 시도"
+
+#: ../urpm.pm:767
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "존재하지 않는 매체「%s」 선택 시도"
+
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "목록 [%s] 생성 중"
+#: ../urpm.pm:783
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
+#, fuzzy, c-format
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
+
+#: ../urpm.pm:1004
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "목록 파일 [%s] 읽는 중"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: 명령어를 찾을 수 없습니다.\n"
+#: ../urpm.pm:1092
+#, fuzzy, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, fuzzy, c-format
-msgid "unable to register rpm file"
-msgstr "RPM 파일「%s」에 접근할 수 없습니다."
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s]의 wget 실패 (wget이 설치되어 있습니까?)"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpm.pm:1109
+#, fuzzy, c-format
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "목록 파일을 생성할 수 없습니다: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] 복사 실패."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, fuzzy, c-format
-msgid "retrieving hdlists file..."
-msgstr "[%s] 추출 중"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, fuzzy, c-format
-msgid "added medium %s"
-msgstr "존재하지 않는 매체「%s」의 제거 시도"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+msgid "no rpm files found from [%s]"
+msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
+
+#: ../urpm.pm:1333
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "[%s] 추출 중"
+
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "md5sum mismatch"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "설정 파일의 %s 줄에 문법 오류"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1541
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "「%s」의 목록파일을 분석할 수 없습니다."
+
+#: ../urpm.pm:1579
+#, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "자동 설치 플로피 디스크 생성"
+msgid "writing list file for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "의존목록에서 %s 항목 위치 재지정"
+msgid "nothing written in list file for \"%s\""
+msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpmf:1
-#, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "[%s] 추출 중"
 
-#: ../urpmi:1
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+msgid "unable to import pubkey file of \"%s\""
+msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1679
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "[%s] 추출 중"
+msgid "reading headers from medium \"%s\""
+msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpmf:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+msgid "building hdlist [%s]"
+msgstr "목록 [%s] 생성 중"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpmq:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
+msgid "found %d headers in cache"
+msgstr "캐쉬에서 %d 헤더를 찾았습니다."
 
-#: ../urpmf:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
+msgid "removing %d obsolete headers in cache"
+msgstr "캐쉬에서 %d 낡은 헤더 제거 중"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "매체「%s」는 이미 존재합니다."
+msgid "mounting %s"
+msgstr "%s 마운트 중"
 
-#: ../_irpm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "installing %s\n"
-msgstr "%s 설치 중...\n"
+msgid "unmounting %s"
+msgstr "%s 마운트 해제 중"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"업데이트하려는 항목이 빠져있습니다.\n"
-"(%s 중 하나)\n"
+msgid "relocated %s entries in depslist"
+msgstr "의존목록에서 %s 항목 위치 재지정"
+
+#: ../urpm.pm:1929
+#, fuzzy, c-format
+msgid "no entries relocated in depslist"
+msgstr "의존목록에서 %s 항목 위치 재지정"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "trying to promote %s"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "유효하지 않은 RPM 파일 이름 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+msgid "retrieving rpm file [%s] ..."
+msgstr "[%s] 추출 중"
+
+#: ../urpm.pm:1955 ../urpm.pm:2821
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
+msgid "unable to register rpm file"
+msgstr "RPM 파일「%s」에 접근할 수 없습니다."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"제거하려는 항목이 빠져있습니다.\n"
-"(%s 중 하나)\n"
+msgid "error registering local packages"
+msgstr "지역 팩키지 등록 오류"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr ""
+msgid "no package named %s"
+msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "The following packages contain %s: %s"
+msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "동일한 파일 이름 「%s」를 가진 여러 개의 팩키지가 존재합니다."
+
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s]의 wget 실패 (wget이 설치되어 있습니까?)"
-
-#: ../urpmi.update:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "package %s is not found."
+msgstr "팩키지 %s를 찾을 수 없습니다."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "잘못된 형식의 입력: [%s]"
+msgid "medium \"%s\" is not selected"
+msgstr "매체 [%s]는 선택되지 않았습니다."
 
-#: ../urpme:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpmq:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
+msgid "unable to access medium \"%s\""
+msgstr "매체「%s」에 접근할 수 없습니다."
 
-#: ../urpmi:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "팩키지 설치 중: [%s] (%s/%s)..."
+msgid "malformed input: [%s]"
+msgstr "잘못된 형식의 입력: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "no entries relocated in depslist"
-msgstr "의존목록에서 %s 항목 위치 재지정"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "[%s] 추출 중"
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "do you agree ?"
-msgstr ""
+#: ../urpm.pm:2786
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "「%s」매체를 생성할 수 없습니다.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
+msgid "removing package %s"
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2796
 #, fuzzy, c-format
-msgid "...retrieving done"
-msgstr "[%s] 추출 중"
+msgid "unable to remove package %s"
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "%s라는 팩키지는 없습니다."
+msgid "unable to install package %s"
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+
+#: ../urpm.pm:3009 ../urpm.pm:3042
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "kdesu가 없음"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
+msgid "in order to install %s"
+msgstr "자동 설치 플로피 디스크 생성"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "이 목록파일 [%s]의 매체를 결정할 수 없습니다."
+msgid "unrequested"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "「%s」의 목록파일을 분석할 수 없습니다."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
+msgid "Invalid signature (%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "due to conflicts with %s"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "캐쉬에서 %d 낡은 헤더 제거 중"
+msgid "Missing signature (%s)"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "의존성 검사없이 설치합니까? (y/N) "
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "선택이 잘못되었습니다. 다시 시도하세요.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:36
 #, c-format
-msgid "Preparing..."
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr ""
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 이 도움말 출력.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] 복사 실패."
-
-#: ../urpmq:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:47
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "매체 이름 「%s」을 사용할 수 없습니다. 벌써 사용 중입니다."
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
 
-#: ../urpmf:1
+#: ../urpme:50
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "매체 「%s」는 이미 사용 중인 목록파일을 사용하려 합니다. 매체 무시됨."
+msgid "unknown packages"
+msgstr "[%s] 팩키지를 열 수 없습니다.\n"
+
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "[%s] 팩키지를 열 수 없습니다.\n"
 
-#: ../urpme:1
+#: ../urpme:93
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+#: ../urpme:95
+#, c-format
+msgid "Nothing to remove"
 msgstr ""
-"사용법: urpmi.addmedia [--update] <이름> <URL>\n"
-"<URL>은 다음 중 하나입니다.\n"
-"       file://<경로>\n"
-"       ftp://<로그인명>:<암호>@<호스트>/<경로> with <팩키지 목록 파일의 상대"
-"경로>\n"
-"       ftp://<호스트>/<경로> with <팩키지 목록 파일의 상대경로>\n"
-"       http://<호스트>/<경로> with <팩키지 목록 파일의 상대경로>\n"
-"       removable_<장치>://<경로>\n"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+msgid "Checking to remove the following packages"
+msgstr "다음 팩키지들 중 하나가 필요합니다:"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, fuzzy, c-format
-msgid "...copying done"
-msgstr "[%s] 추출 중"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
+msgid " (y/N) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "%s 제거 중"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, fuzzy, c-format
-msgid "unable to access first installation medium"
-msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
+msgid "Removing failed"
+msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
 #, c-format
-msgid "virtual medium need to be local"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "error registering local packages"
-msgstr "지역 팩키지 등록 오류"
+msgid "  --update       - use only update media.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:38
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
-
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:41
 #, c-format
-msgid "Save file"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
+msgid "  --all          - print all tags.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "설정 파일 [%s]에 기록할 수 없습니다."
+msgid "  --group        - print tag group: group.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:44
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "「%s」매체를 생성할 수 없습니다.\n"
-
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "다음 팩키지들 중 하나가 필요합니다:"
+#: ../urpmf:51
+#, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "RPM 파일「%s」에 접근할 수 없습니다."
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "RPM 파일「%s」에 접근할 수 없습니다."
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s 마운트 해제 중"
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
-"요.\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "의존목록 파일 [%s] 읽기"
+#: ../urpmi:84 ../urpmq:49
+#, c-format
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "설치를 강제 추진합니까? (y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "[%s] 추출 중"
+#: ../urpmi:86 ../urpmq:51
+#, c-format
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "[%s] 팩키지를 열 수 없습니다.\n"
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "존재하지 않는 매체「%s」 선택 시도"
+#: ../urpmi:96
+#, c-format
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"제거할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세요.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - 이 도움말 출력.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "목록 파일 [%s] 읽는 중"
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "계속할까요?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "목록 파일 [%s] 읽는 중"
-
-#: ../urpme:1
+#: ../urpmi:128
 #, c-format
-msgid "Nothing to remove"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
+#: ../urpmi:129 ../urpmq:81
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "존재하지 않는 매체「%s」의 제거 시도"
+#: ../urpmi:130 ../urpmq:83
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:141
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "존재하지 않는 매체「%s」 선택 시도"
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr "그냥 둠"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "[%s] 추출 중"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "설치 실패."
+
+#: ../urpmi:239
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:240
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s 설치 중...\n"
+msgid "Copying failed"
+msgstr "[%s] 추출 중"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s]에서 RPM 파일을 찾을 수 없습니다."
+msgid "Only superuser is allowed to install packages"
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
+#: ../urpmi:396
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "다음 팩키지들 중 하나가 필요합니다:"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "어느 것을 선택하시겠습니까? (1-%d) "
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "[%s] 추출 중"
+msgid "Package installation..."
+msgstr "설치할 팩키지 준비 중..."
+
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "초기화..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "팩키지 %s를 찾을 수 없습니다."
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "존재하지 않는 매체「%s」의 제거 시도"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
+"되지 않습니다.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, fuzzy, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "취소"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"업그레이드하기 위해서는 일부 팩키지가 제거되어야 합니다. 이 기능은 아직 지원"
+"되지 않습니다.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "의존성을 총족시키기 위해, 다음 팩키지들도 설치될 것입니다. (%d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "매체「%s」에 접근할 수 없습니다."
+msgid "unable to get source packages, aborting"
+msgstr "소스 팩키지를 구할 수 없습니다, 중단합니다."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "「%s」매체를 생성할 수 없습니다.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
+
+#: ../urpmi:541
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "다 되었으면 ENTER키를 누르세요..."
 
-#: ../urpmf:1
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
+
+#: ../urpmi:619
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "Installation failed"
+msgstr "설치 실패."
+
+#: ../urpmi:665
+#, fuzzy, c-format
+msgid "distributing %s"
+msgstr "%s 설치 중...\n"
+
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "%s 설치 중...\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "「%s」의 목록 파일에 접근할 수 없습니다. 매체 무시됨."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "팩키지 설치 중: [%s] (%s/%s)..."
 
-#: ../urpmf:1
+#: ../urpmi:712
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "의존성 검사없이 설치합니까? (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "설치를 강제 추진합니까? (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "목록 파일 [%s] 읽는 중"
+msgid "%d installation transactions failed"
+msgstr "설치 실패."
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, fuzzy, c-format
-msgid "copying hdlists file..."
-msgstr "목록 파일 [%s] 읽는 중"
+msgid "Installation is possible"
+msgstr "설치 실패."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "모든 것이 이미 설치되어 있습니다."
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"사용법: urpmi.addmedia [--update] <이름> <URL>\n"
+"<URL>은 다음 중 하나입니다.\n"
+"       file://<경로>\n"
+"       ftp://<로그인명>:<암호>@<호스트>/<경로> with <팩키지 목록 파일의 상대"
+"경로>\n"
+"       ftp://<호스트>/<경로> with <팩키지 목록 파일의 상대경로>\n"
+"       http://<호스트>/<경로> with <팩키지 목록 파일의 상대경로>\n"
+"       removable_<장치>://<경로>\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "Do nothing"
-msgstr "그냥 둠"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "mounting %s"
-msgstr "%s 마운트 중"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"목록 파일이 다른 매체에 의해 이미 사용되고 있기 때문에, 매체 「%s」를 사용할 "
-"수 없습니다."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "소스 팩키지를 구할 수 없습니다, 중단합니다."
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
-
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "[%s] 추출 중"
-
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "매체 [%s]는 선택되지 않았습니다."
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "「%s」에 대한 목록 파일을 찾을 수 없습니다. 매체 무시됨."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
+
+#: ../urpmi.addmedia:135
+#, fuzzy, c-format
+msgid "retrieving mirrors at %s ..."
+msgstr "[%s] 추출 중"
+
+#: ../urpmi.addmedia:172
+#, fuzzy, c-format
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "「%s」매체를 업데이트할 수 없습니다.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
+msgid "<relative path of hdlist> missing\n"
+msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "「%s」매체를 생성할 수 없습니다.\n"
+msgid "`with' missing for network media\n"
+msgstr "FTP 미디어에 대해 「with」가 빠져있습니다.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "「%s」매체를 생성할 수 없습니다.\n"
+
+#: ../urpmi.removemedia:34
+#, fuzzy, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"사용법: urpmi.removemedia [-a] <이름> ...\n"
+"<이름>은 제거할 매체명.\n"
+"   -a    모든 매체 선택.\n"
+"\n"
+"알 수 없는 옵션 「%s」\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"제거할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세요.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "「%s」매체를 생성할 수 없습니다.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "[%s] 추출 중"
-
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"제거하려는 항목이 빠져있습니다.\n"
+"(%s 중 하나)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, fuzzy, c-format
-msgid "distributing %s"
-msgstr "%s 설치 중...\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"사용법: urpmi.removemedia [-a] <이름> ...\n"
+"<이름>은 제거할 매체명.\n"
+"   -a    모든 매체 선택.\n"
+"\n"
+"알 수 없는 옵션 「%s」\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "설치 실패."
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "설정 파일 [%s]에 기록"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
+"요.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"업데이트하려는 항목이 빠져있습니다.\n"
+"(%s 중 하나)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:53
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid "  --list         - list available packages.\n"
+msgstr ""
+
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "확인"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "%s 제거 중"
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"팩키지 자동 설치...\n"
-"님은 팩키지 %s의 설치를 요청했습니다.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:82
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "[%s] 추출 중"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "kdesu가 없음"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:327
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
 msgstr ""
-"사용법: urpmi.removemedia [-a] <이름> ...\n"
-"<이름>은 제거할 매체명.\n"
-"   -a    모든 매체 선택.\n"
-"\n"
-"알 수 없는 옵션 「%s」\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "존재하지 않는 매체「%s」 선택 시도"
-
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "다음 팩키지들 중 하나가 %s를 설치하는데 필요합니다:"
+
 #, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "설치 실패."
diff --git a/po/ky.po b/po/ky.po
index 3cd7d356..ad3e73c2 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-03 07:55+0600\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail.ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -34,879 +34,784 @@ msgstr "YyоО"
 msgid "Nn"
 msgstr "NnжЖ;:"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s орнотулууда\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - автоматтык түрдө бардык булактарды орнотуу\n"
-"                   булагынан түзүү.\n"
+"Пакеттерди автоматтык орнотуу...\n"
+"Сиз %s пакетин орнотууну талап кылдыңыз\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb ачууга болбоду"
+msgid "Is this OK?"
+msgstr "Бул туурабы?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - бул жардамды чыгаруу.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s орнотуу үчүн төмөнкү пакеттердин бири талап кылынат:"
+msgid "Cancel"
+msgstr "Калтыруу"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s пакети алынып салынууда"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: команда табылбады\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Параллелдик режимди use-distrib режими менен чогуу колдонууга болбойт"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"колдонулушу: %s [опциялар]\n"
+"[опциялар] мындай\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Бардыгы алдагачан орнотулган"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - бул жардам кабарын чыгаруу.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - башсаптар (headers) кэшинин каталогун тазалоо.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - жыйынтыгын берилген группа менен чектөө.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "транзакцияны аткаруу үчүн %d процесси колдонулууда"
+msgid "                    defaults is %s.\n"
+msgstr "                    алдыалынганы %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s үчүн белгисиз протокол берилген"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Сиздин тандооңуз? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "кэште %d башсап табылды"
+msgid "unable to handle protocol: %s"
+msgstr "протокол аткарылбады: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "\"%s\" rpm файл аты бирдей болгон бир нече пакет бар"
+msgid "syntax error in config file at line %s"
+msgstr "конфиг файлдын %s-сабында синтаксистик ката"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - прокси аутентификациясы үчүн колдонуучу жана паролду\n"
-"                   көрсөтүү (форматы: <user:password>).\n"
+"\"%s\" булагы алдагачан колдонулуп жаткан hdlist алуу аракетинде, булак "
+"четке кагылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "көз карандылыктарды экинчи жолку эсептөөсүү аткарылууда\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"\"%s\" булагы алдагачан колдонулуп жаткан тизмени алуу аракетинде, булак "
+"четке кагылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "[%s] rpm файлы кабыл алынууда..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"\"%s\" булагын сактап калуу мүмкүн эмес, себеби файл тизмесин башка булак "
+"колдонууда"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - мүмкүн болгон параллель алиастар тизмеси.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"\"%s\" атын, аты аталбаган булакка колдонуу мүмкүн эмес, себеби ал алдагачан "
+"колдонууда"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...кабыл алуу ийгиликсиз: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "\"%s\" булагын көңүлгө алууга болбойт, себеи [%s] тизме файлы жок"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" үчүн тизме файлын текшерүүгө болбоду, булак четке кагылды"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "бул hdlist [%s] файлынын булагын аныктоо мүмкүн эмес"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - бинардык OR оператору, эгер туюнтмалардын бири\n"
-"                     чындык болсо true кайтарылат.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" үчүн hdlist файлына жетүүгө болбоду, булак четке кагылды"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Пакет орнотулууда..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" үчүн тизме файлына жетүүгө болбоду, булак четке кагылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "[%s] туура эмес rpm файл аты"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "\"%s\" бар булагынан аттап өтүү аракети, калтырылды"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"\"%s\" виртуалдык булагы hdlist же тизме файлын аныктабашы керек, булак "
+"четке кагылды"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d орнотуу транзакциялары ишке ашпады"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"\"%s\" виртуалдык булагынын url'и бош болушу керек, булак четке кагылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"биринчи инсталлялык булакка жетүүгө болбоду (Mandrake/base/hdlists файлы "
-"табылбады)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" үчүн hdlist файлы табылбады, булак четке кагылды"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Кечириңиз, туура эмес тандоо, кайталап көрүңүз\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" үчүн тизме файлы табылбады, булак четке кагылды"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Сактоо үчүн орун тандаңыз"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" үчүн тизме файлы байланышсыз, булак четке кагылды"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - summary: жалпы маалымат тэгин чыгаруу .\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" үчүн тизме файлын текшерүүгө болбоду, булак четке кагылды"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Төмөнкү пакеттер %s камтыйт: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
+" \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери өтө эле көп "
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Аны орнотуу"
+msgid "taking removable device as \"%s\""
+msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X интерфейсин колдонуу.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Төмөнкү пакеттердин бири талап кылынат:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн эмес"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Көз карандылыктарды канаатандыруу үчүн төмөнкү пакеттер алынып салынат (%d "
-"Мб)"
+msgid "unable to write config file [%s]"
+msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - чөйрөгө жараша оңтойлуу интефейсти тандоо:\n"
-"                   X же текст режими.\n"
+msgid "write config file [%s]"
+msgstr "[%s] конфиг файлын жазуу"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "`%s' пакети жүктөлүүдө..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Параллелдик режимди use-distrib режими менен чогуу колдонууга болбойт"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "--install-src колдонууда бинардык rpm файлдарын эмне кылуу"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
-"                         тандоо.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "[%s] файлынын ичинде параллелдик аткаргыч текшерилүүдө"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "%s аттуу пакет жок"
+msgid "found parallel handler for nodes: %s"
+msgstr "%s бутактары үчүн параллелдик аткаруучу табылды"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - бардык тийиштүүсүн командалык саптан алуу.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "параллелдик режим үчүн байланышкан булак колдонулууда: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Орнотуу ишке ашпады, кээ бир файлдар жок:\n"
-"%s\n"
-"Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
+msgid "unable to use parallel option \"%s\""
+msgstr "\"%s\" параллелдик опциясын колдонуу мүмкүн эмес"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"колдонулушу: urpmi.removemedia [-a] <аты> ...\n"
-"мында: <аты> алынып салынуучу булак аты.\n"
+"--synthesis төмөнкүлөр менен бирге --media, --excludemedia, --sortmedia, --"
+"update же --parallel менен колдонууга болбойт"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Орнотууну улантууга болбойт, себеби башкаларын жаңылоо\n"
-"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "[%s] synthesis файлы текшерилүүдө"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "тармактык булак үчүн `with' жок\n"
+msgid "examining hdlist file [%s]"
+msgstr "[%s] hdlist файлы текшерилүүдө"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "\"%s\" виртуалдык булагы локалдык эмес, булак четке кагылды"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "белгисиз пакет"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist же synthesis файлын окуу проблемасы"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Орнотууга мүмкүн"
+msgid "performing second pass to compute dependencies\n"
+msgstr "көз карандылыктарды экинчи жолку эсептөөсүү аткарылууда\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "%s пакети коё берилүүдө"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат (%d Мб)"
+msgid "would install instead of upgrade package %s"
+msgstr "%s пакетин жаңылоонун ордуна аны орнотуу аткарылат"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "\"%s\" булагын көңүлгө алууга болбойт, себеи [%s] тизме файлы жок"
+msgid "unable to open rpmdb"
+msgstr "rpmdb ачууга болбоду"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" булагы алдагачан бар"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "cooker дистрибутивинин жаңылоосун кошууга болбойт\n"
+msgid "virtual medium need to be local"
+msgstr "виртуалдык булак локалдык болушу керек"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - кеңири режим.\n"
+msgid "added medium %s"
+msgstr "%s булагы кошулду"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Инициализациялоо жүрүп жатат..."
+msgid "unable to access first installation medium"
+msgstr "инсталляциянын биринчи булагына жетүү мүмкүн эмес"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - мүмкүн болгон пакеттер тизмеси.\n"
+msgid "copying hdlists file..."
+msgstr "hdlists файлы көчүрүлүүдө..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - бардык тэгдерди чыгаруу.\n"
+msgid "...copying failed"
+msgstr "...көчүрүү ишке ашпады"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"түшүнүлбөгөн \"%s\" булагы чыкма түзүлүш катары көрсөтүлгөн, бирок ал андай "
-"эмес"
+msgid "...copying done"
+msgstr "...көчүрүү аяктады"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"\"%s\" виртуалдык булагы hdlist же тизме файлын аныктабашы керек, булак "
-"четке кагылды"
+"биринчи инсталлялык булакка жетүүгө болбоду (Mandrake/base/hdlists файлы "
+"табылбады)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "көчүрүлгөн баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
+msgid "retrieving hdlists file..."
+msgstr "hdlists файлы кабыл алынууда..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - үтүр менен ажыратылган жолдорду карабоо.\n"
+msgid "...retrieving done"
+msgstr "...кабыл алуу аяктады"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Даяр болгон соң, Enter басыңыз..."
+msgid "...retrieving failed: %s"
+msgstr "...кабыл алуу ийгиликсиз: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"белгисиз опциялар: '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlists файлында туура эмес \"%s\" hdlist дескриптору"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - эгер көрсөтүлгөндөрдөн башка кошумча пакеттер орнотулса\n"
-"                   же жаңыланса майда транзакцияларга бөлүү,\n"
-"                   алдыалынганы %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "жашабаган \"%s\" булагын тандоо аракети"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist же synthesis файлын окуу проблемасы"
+msgid "selecting multiple media: %s"
+msgstr "составдык булак тандалууда: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - алыста жайгашкан файлдары wget аркылуу кабылдоо.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - пакетти табуу үчүн, provides'терден издөө уруксаты.\n"
+msgid "removing medium \"%s\""
+msgstr "\"%s\" булагы алынып салынууда"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - --parallel колдонуудагы мүмкүн болгон түйүндөр тизмеси.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "hdlist [%s] түзүлүшү"
+"\"%s\" булагына жетүүгө болбойт,\n"
+"бул ката сиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
+"мүмкүн."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - мүмкүн болсо бар пакеттерди калтыруу, алып салууга\n"
-"                   алып келүүчү пакеттерди талап кылууну четке кагуу.\n"
+"\"%s\" виртуалдык булагы туура hdlist же synthesis керектейт, булак четке "
+"кагылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM файлы текшерилүүдө"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: команда табылбады\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm файлын каттого болбоду"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM файлы текшерилүүдө"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - колдонуучудан пакеттердин көз карандылыктарына\n"
-"                   карабай орнотуу уруксатын алуу.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" үчүн баштапкы hdlist (же synthesis) көчүрүлүүдө ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "протокол аткарылбады: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыска)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists файлы кабыл алынууда..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "көчүрүлгөн баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ооба, аны орнотуу"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "%s булагы кошулду"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "\"%s\" булагынын synthesis файлын окуу проблемасы"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - колдонулбаган rpm кэште сактоо.\n"
+msgid "reading rpm files from [%s]"
+msgstr "[%s] булагынын rpm файлдары окулууда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"%s ичине инсталляциялоо үчүн транзакция түзүлдү (remove=%d, install=%d, "
-"upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s] булагынан rpm файлдарын окууга болбоду: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum дал келбестиги"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] булагында rpm файлдары табылдбады"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "конфиг файлдын %s-сабында синтаксистик ката"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  командалык сапта көрсөтүлгөн аттар жана rpm файлдар орнотулат.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "изделген hdlist (же synthesis) табылды: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - көрсөтүлгөн HTTP проксини колдонуу, алдыалынган\n"
-"                   порт номери 1080 (форматы: <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "%s орнотуу үчүн"
+msgid "md5sum mismatch"
+msgstr "md5sum дал келбестиги"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s жазуу depslist'ке өткөрүлдү"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "hdlist (же synthesis) кабыл алуунун ишке ашпагандыгы"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
-"албоо.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Баг отчету үчүн [%s] каталогун түзүүгө болбоду"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "[%s] файлы окшош \"%s\" булагында алдагачан колдонулууда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s пакетин жаңылоонун ордуна аны орнотуу аткарылат"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" үчүн hdlist файлын түшүнө албадым"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "күзгүлөр, мындан: %s, кабыл алынууда ..."
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" үчүн тизме файлын жазууга болбоду"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - url: url тэгин чыгаруу.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s үчүн белгисиз протокол берилген"
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" үчүн тизме файлына эч нерсе жазылган жок"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
-"  -r             - версиясын жана релизин наамдары менен кошо чыгаруу.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" булагы алдагачан бар"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "%s орнотулууда\n"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" булагынын башсаптары окулууда"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"жаңылоо үчүн пунк жок\n"
-"(%s ичинен бири)\n"
+msgid "building hdlist [%s]"
+msgstr "hdlist [%s] түзүлүшү"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "%s активдештирүү аракети"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "%s пакетин алып салууга мүмкүн эмес"
+msgid "found %d headers in cache"
+msgstr "кэште %d башсап табылды"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "\"%s\" булагынын synthesis файлын окуу проблемасы"
+msgid "removing %d obsolete headers in cache"
+msgstr "кэштеги эскирген %d башсап өчүүрүлүүдө"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"алынып салынуучу пункт жок\n"
-"(%s ичинен бири)\n"
+msgid "mounting %s"
+msgstr "%s бириктирилүүдө"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - бардык булактарды тандоо.\n"
+msgid "unmounting %s"
+msgstr "%s ажыратылууда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Сигнатура жок (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "%s жазуу depslist'ке өткөрүлдү"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s] булагынан rpm файлдарын окууга болбоду: %s"
+msgid "no entries relocated in depslist"
+msgstr "depslist'ке бир дагы жазуу өткөрүлгөн жок"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "[%s] туура эмес rpm файл аты"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыска)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "[%s] rpm файлы кабыл алынууда..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - жаңылоо булагын гана жаңылоо.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "[%s] rpm файлына жетүүгө болбоду"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "unable to register rpm file"
+msgstr "rpm файлын каттого болбоду"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - жыйынтыгын берилген группа менен чектөө.\n"
+msgid "error registering local packages"
+msgstr "локалдык пакеттерди каттоо катасы"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"\"%s\" булагы алдагачан колдонулуп жаткан тизмени алуу аракетинде, булак "
-"четке кагылды"
+msgid "no package named %s"
+msgstr "%s аттуу пакет жок"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "туура эмес форматталган кирүү: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Төмөнкү пакеттер %s камтыйт: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "\"%s\" rpm файл аты бирдей болгон бир нече пакет бар"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - мүмкүн болгон булактар тизмеси.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "[%s] туура ажыратууга мүмкүн эмес, ал \"%s\" ичинде"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
+"\"%s\" булагы туура эмес тизме файлын колдонууда:\n"
+"  мүмкүн күзгү эски, альтернативдик методду колдонуу аракети"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "depslist'ке бир дагы жазуу өткөрүлгөн жок"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "\"%s\" булагы rpm файлдарынын турган жерин аныктабайт"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - баштапкы пакетти гана орнотуу (бинардыктарын орнотпоо).\n"
+msgid "package %s is not found."
+msgstr "%s пакети табылбады."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - алыста жайгашкан файлдары curl аркылуу кабылдоо.\n"
+msgid "urpmi database locked"
+msgstr "urpmi берилиштер базасы кулпуланган"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - түздөн түз perl кодун perl -e сыяктуу кошуу.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" булагы тандалган эмес"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "макулсузбу ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "[%s] rpm файлын \"%s\" булагынан окуу мүмкүн эмес"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" үчүн тизме файлы байланышсыз, булак четке кагылды"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"түшүнүлбөгөн \"%s\" булагы чыкма түзүлүш катары көрсөтүлгөн, бирок ал андай "
+"эмес"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...кабыл алуу аяктады"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s пакети кошулууда (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "туура эмес форматталган кирүү: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "%s пакети коё берилүүдө"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу жүрүп жатат..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Туура эмес сигнатура (%s)"
+msgid "Preparing..."
+msgstr "Даярдоо ..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  командалык сапта көрсөтүлгөн наамдар же rpm файлдар суралды.\n"
+msgid "using process %d for executing transaction"
+msgstr "транзакцияны аткаруу үчүн %d процесси колдонулууда"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi версиясы %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "[%s] туура ажыратууга мүмкүн эмес, ал \"%s\" ичинде"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - үтүр менен бөлүнөп көрсөтүлгөн булактарды колдонбоо.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "бул hdlist [%s] файлынын булагын аныктоо мүмкүн эмес"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" үчүн hdlist файлын түшүнө албадым"
+"%s ичине инсталляциялоо үчүн транзакция түзүлдү (remove=%d, install=%d, "
+"upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"\"%s\" булагы алдагачан колдонулуп жаткан hdlist алуу аракетинде, булак "
-"четке кагылды"
+msgid "unable to create transaction"
+msgstr "транзакция түзүүгө мүмкүн эмес"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "%s менен конфликтешкендиги үчүн"
+msgid "removing package %s"
+msgstr "%s пакети алынып салынууда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "кэштеги эскирген %d башсап өчүүрүлүүдө"
+msgid "unable to remove package %s"
+msgstr "%s пакетин алып салууга мүмкүн эмес"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "\"%s\" булагын жаңылоого болбоду\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s пакети кошулууда (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
+msgid "unable to install package %s"
+msgstr "%s пакетин орнотуу мүмкүн эмес"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "\"%s\" виртуалдык булагы локалдык эмес, булак четке кагылды"
+msgid "due to missing %s"
+msgstr "%s жоктугунан"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Даярдоо ..."
+msgid "due to unsatisfied %s"
+msgstr "%s канаатанбагандыгынан"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    алдыалынганы %s.\n"
+msgid "trying to promote %s"
+msgstr "%s активдештирүү аракети"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
+msgid "in order to keep %s"
+msgstr "%s сактоо үчүн"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - synthesis же hdlist файлын издөөгө\n"
-"                    аракет кылбоо.\n"
+msgid "in order to install %s"
+msgstr "%s орнотуу үчүн"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - пакетти табуу үчүн, provides'терден издебөө.\n"
+msgid "due to conflicts with %s"
+msgstr "%s менен конфликтешкендиги үчүн"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
+msgid "unrequested"
+msgstr "талап кылынбаган"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - иштөө учурунда distrib дарагынан urpmi-ди конфигдөө.\n"
-"                   Опция дистрибутивди суроо-талабына уруксат берет.\n"
+msgid "Invalid signature (%s)"
+msgstr "Туура эмес сигнатура (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"колдонулушу: %s [опциялар]\n"
-"[опциялар] мындай\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Туура эмес Key ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - аракет кылуу алдында, адегенде rpm кэшин тазалоо.\n"
+msgid "Missing signature (%s)"
+msgstr "Сигнатура жок (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"\"%s\" атын, аты аталбаган булакка колдонуу мүмкүн эмес, себеби ал алдагачан "
-"колдонууда"
+msgid "bad proxy declaration on command line\n"
+msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - conflicts: бардык конфликтер тэгин чыгаруу.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"\"%s\" виртуалдык булагы туура hdlist же synthesis керектейт, булак четке "
-"кагылды"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Кечириңиз, туура эмес тандоо, кайталап көрүңүз\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -923,1102 +828,1243 @@ msgstr ""
 "\n"
 "колдонулушу:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - бул жардамды чыгаруу.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"колдонулушу: urpmi.addmedia [опциялар] <аты> <url> [with <салыштырма_жол>]\n"
-"<url> төмөнкүнүн бири:\n"
-"       file://<жол>\n"
-"       ftp://<логин>:<пароль>@<хост>/<жол> <hdlist салыштырма файл аты>\n"
-"       ftp://<хост>/<жол> <hdlist салыштырма файл аты>\n"
-"       http://<хост>/<жол> <hdlist салыштырма файл аты>\n"
-"       removable://<жол>\n"
-"\n"
-"жана [опциялар] төмөндөгүлөрдөн\n"
+"  --auto         - сунушталгандардын ичинен пакетти автоматтык тандоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" үчүн баштапкы hdlist (же synthesis) көчүрүлүүдө ..."
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - туура орнотулгандыгын текшерүү мүмүкүнчүлүгү.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "...copying done"
-msgstr "...көчүрүү аяктады"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - кээ бир пакеттер жок болсо дагы, мажбурлап аткаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "\"%s\" параллелдик опциясын колдонуу мүмкүн эмес"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
+
+#: ../urpme:46 ../urpmi:103
+#, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"\"%s\" булагы туура эмес тизме файлын колдонууда:\n"
-"  мүмкүн күзгү эски, альтернативдик методду колдонуу аракети"
+"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
+"конфигурациялоо,\n"
+"                   chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "инсталляциянын биринчи булагына жетүү мүмкүн эмес"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - кеңири режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "виртуалдык булак локалдык болушу керек"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - туюнтмага туура келген бардык пакеттерди тандоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "локалдык пакеттерди каттоо катасы"
+msgid "unknown packages"
+msgstr "белгисиз пакеттер"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - жүктөө ылдамдыгын чектөө.\n"
+msgid "unknown package"
+msgstr "белгисиз пакет"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "изделген hdlist (же synthesis) табылды: %s"
+msgid "removing package %s will break your system"
+msgstr "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "hdlist (же synthesis) кабыл алуунун ишке ашпагандыгы"
+msgid "Nothing to remove"
+msgstr "Алып салууга эч нерсе жок"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] булагында rpm файлдары табылдбады"
+msgid "Checking to remove the following packages"
+msgstr "Төмөнкү пакеттерди алып салуу мүмкүнчүлүгүн текшерүү"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" үчүн тизме файлына эч нерсе жазылган жок"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Көз карандылыктарды канаатандыруу үчүн төмөнкү пакеттер алынып салынат (%d "
+"Мб)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
+msgid "removing %s"
+msgstr "%s алынып салынууда"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - пакетти алып салууда кеңири маалымат чыгаруу.\n"
+msgid "Removing failed"
+msgstr "Алып салуу ишке ашпады"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf версиясы %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s пакетин орнотуу мүмкүн эмес"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - жаңылоо булагын гана колдонуу.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - үтүр менен бөлүнүп көрсөтүлгөн булактарды гана колдонуу.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - үтүр менен бөлүнөп көрсөтүлгөн булактарды колдонбоо.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - колдонуучудан пакеттердин көз карандылыктарына\n"
-"                   жана бүтүндүгүнө карабай орнотуу уруксатын алуу.\n"
+"  --sortmedia    - үтүр менен бөлүнгөп саптарга ылайык булактарды сорттоо.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Файлды сактоо"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db ордуна synthesis колдонуу.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - кеңири режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "[%s] конфиг файлын жазуу мүмкүн эмес"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - name тэгин чыгарбоо (алдынала иштетилген, эгер тэг\n"
+"                   командалык сапта берилбесе, интерактивдүү режим менен \n"
+"                   чогуу иштебейт).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - туюнтмага туура келген бардык пакеттерди тандоо.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - бирдей саптарды чыгарбоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Туура эмес Key ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - бардык тэгдерди чыгаруу.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - кээ бир пакеттер жок болсо дагы, мажбурлап аткаруу.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - group: группа тэгин чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн эмес"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - size: өлчөмү тэгин чыгаруу.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - synthesis файлын издөө жана аны колдонуу.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - epoch: epoch тэгин чыгаруу.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - summary: жалпы маалымат тэгин чыгаруу .\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - gpg ачкычын жаңылоого мажбурлоо.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist файлынын салыштырма жолу> жок\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Төмөнкү пакеттерди алып салуу мүмкүнчүлүгүн текшерүү"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "талап кылынбаган"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - buildhost: түзүүчү хост тэгин чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "[%s] rpm файлына жетүүгө болбоду"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - url: url тэгин чыгаруу.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - files: бардык файлдар тэгин чыгаруу.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Орнотууну улантууну каалайсызбы ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - files: бардык файлдар тэгин чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "[%s] rpm файлын \"%s\" булагынан окуу мүмкүн эмес"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - conflicts: бардык конфликтер тэгин чыгаруу.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
-"конфигурациялоо,\n"
-"                   chroot орнотуу үчүн --root опциясын колдонууда ыңгайлуу.\n"
+"  --env          - спецификалык чөйрөнү колдонуу (демейде\n"
+"                   ката жөнүндө отчет).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
+"албоо.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - керектүү информацияны окууга ыңгайлуу формада чыгаруу.\n"
+"  -f             - версиясын, релизин жана архитектурасын аттары менен кошо "
+"чыгаруу.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - дистрибутивдин көрсөтүлгөн версиясын колдонуу,\n"
-"                   алдынала, орнотулган mandrake-release пакети берген\n"
-"                  кабардагы дистрибутив версиясы колдонулат.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - түздөн түз perl кодун perl -e сыяктуу кошуу.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - күзгүлөрдүн тизмеси үчүн көрсөтүлгөн url\n"
-"                   колдонуу, алдынала колдонулганы %s \n"
+"  -a             - бинардык AND оператору, эгер туюнтмалардын экөө\n"
+"                    тең чындык болсо true кайтарылат.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
-"конфигурациялоо,\n"
-"                   chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
+"  -o             - бинардык OR оператору, эгер туюнтмалардын бири\n"
+"                     чындык болсо true кайтарылат.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - унардык NOT, туюунтма жалган болсо true кайтарылат.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - сол кашаа, туюнтмалардын группасын ачат.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - оң кашаа, туюнтмалардын группасын жабат.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"[%s] каталогу алдагачан бар, баг жөнүндө билдирүү үчүн башка каталог "
-"колдонуңуз же аны өчүрүңүз"
+"тескери чакыруу :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s ажыратылууда"
+msgid "using specific environment on %s\n"
+msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "жаңылоого эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% аткарылды, ылдамдыгы = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi версиясы %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi кайра ишке киргизилүүдө"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "[%s] synthesis файлы текшерилүүдө"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
+"                         тандоо.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - эч качан пакетти алып салууну сурабоо, орнотууну "
+"токтотуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...көчүрүү ишке ашпады"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - мүмкүн болсо бар пакеттерди калтыруу, алып салууга\n"
+"                   алып келүүчү пакеттерди талап кылууну четке кагуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" үчүн hdlist файлына жетүүгө болбоду, булак четке кагылды"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - эгер көрсөтүлгөндөрдөн башка кошумча пакеттер орнотулса\n"
+"                   же жаңыланса майда транзакцияларга бөлүү,\n"
+"                   алдыалынганы %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - кыскартылган режим (quiet).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - майда транзакциянын узундугу, алдыалынганы %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - кеңири режим.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
+"  --fuzzy        - издөөнү так эмес логиканын негизинде көрсөтүү (-y "
+"сыяктуу).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - жүктөө алдында пакеттердин баштапкы коддорун чыгаруу "
-"(root үчүн гана).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - кийинки пакет-баштапкы пакет (-s сыяктуу).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - stdout үчүн urpmi db санап көрсөткөн пакеттердин\n"
-"                   башсаптарын чыгаруу (root үчүн гана).\n"
+"  --install-src  - баштапкы пакетти гана орнотуу (бинардыктарын орнотпоо).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "белгисиз пакеттер"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - аракет кылуу алдында, адегенде rpm кэшин тазалоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "составдык булак тандалууда: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - колдонулбаган rpm кэште сактоо.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - версиясын, релизин жана архитектурасын аттары менен кошо "
-"чыгаруу.\n"
+"  --allow-nodeps - колдонуучудан пакеттердин көз карандылыктарына\n"
+"                   карабай орнотуу уруксатын алуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "[%s] файлы окшош \"%s\" булагында алдагачан колдонулууда"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - колдонуучудан пакеттердин көз карандылыктарына\n"
+"                   жана бүтүндүгүнө карабай орнотуу уруксатын алуу.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"алып салууга эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
+"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
+"конфигурациялоо,\n"
+"                   chroot орнотуу үчүн --root опциясын колдонууда ыңгайлуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" үчүн тизме файлы табылбады, булак четке кагылды"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - алыста жайгашкан файлдары wget аркылуу кабылдоо.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - бул жардам кабарын чыгаруу.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - алыста жайгашкан файлдары curl аркылуу кабылдоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "%s бутактары үчүн параллелдик аткаруучу табылды"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - жүктөө ылдамдыгын чектөө.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"тескери чакыруу :\n"
-"%s\n"
+"  --resume       - жарым-жартылай кабыл алынган файлдарды жүктөөнү\n"
+"                   улантуу (--no-resume муну өчүрөт, алдынала өчүрүлгөн).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - кректелген пакеттерди тескери тартипте издөө.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - көрсөтүлгөн HTTP проксини колдонуу, алдыалынган\n"
+"                   порт номери 1080 (форматы: <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf версиясы %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
+"  --proxy-user   - прокси аутентификациясы үчүн колдонуучу жана паролду\n"
+"                   көрсөтүү (форматы: <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - name тэгин чыгарбоо (алдынала иштетилген, эгер тэг\n"
-"                   командалык сапта берилбесе, интерактивдүү режим менен \n"
-"                   чогуу иштебейт).\n"
+"  --bug          - баг отчетторун кийинки аргумент\n"
+"                   көрсөткөн каталогго sчыгаруу.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - бирдей саптарды чыгарбоо.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X интерфейсин колдонуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis төмөнкүлөр менен бирге --media, --excludemedia, --sortmedia, --"
-"update же --parallel менен колдонууга болбойт"
+"  --best-output  - чөйрөгө жараша оңтойлуу интефейсти тандоо:\n"
+"                   X же текст режими.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - көрсөтүлгөн архитектураны колдонуу, алдынала\n"
-"                   орнотулган mandrake-release пакетинин архитектурасы\n"
-"                   колдонулат.\n"
+"  --verify-rpm   - орнотуу алдында rpm сигнатурасын текшерүү\n"
+"                   (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Бул туурабы?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - үтүр менен ажыратылган жолдорду карабоо.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - документациялык файлдарды карабоо (docs).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db ордуна synthesis колдонуу.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - бардык тийиштүүсүн командалык саптан алуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "[%s] файлынын ичинде параллелдик аткаргыч текшерилүүдө"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - пакетти табуу үчүн, provides'терден издөө уруксаты.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Алып салууга эч нерсе жок"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - пакетти табуу үчүн, provides'терден издебөө.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - издөөнү так эмес логиканын негизинде көрсөтүү(--fuzzy "
+"сыяктуу).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" булагынын башсаптары окулууда"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - кийинки пакет-баштапкы пакет (--src сыяктуу).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d             - пакеттерди көз карандылыктары үчүн кеңейтилген суроо-"
-"талап.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - кыскартылган режим (quiet).\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - баг отчетторун кийинки аргумент\n"
-"                   көрсөткөн каталогго sчыгаруу.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  командалык сапта көрсөтүлгөн аттар жана rpm файлдар орнотулат.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "\"%s\" булагы rpm файлдарынын турган жерин аныктабайт"
+msgid "Choose location to save file"
+msgstr "Сактоо үчүн орун тандаңыз"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "--install-src колдонууда бинардык rpm файлдарын эмне кылуу"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" үчүн тизме файлын жазууга болбоду"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Сиз төмөнкү баштапкы пакетти тандап алдыңыз:\n"
+"\n"
+"%s\n"
+"\n"
+"Мүмкүн сизге муну орнотуунун зарылчылыгы жоктур (муну\n"
+"орнотуу баштапкы кодду модификациялап андан кийин\n"
+"компиляциялоо мүмкүнчүлүгүн берет).\n"
+"Эмне кылууну каалайсыз?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
+msgid "Do nothing"
+msgstr "Эч нерсе"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "жашабаган \"%s\" булагын тандоо аракети"
+msgid "Yes, really install it"
+msgstr "Ооба, аны орнотуу"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
+msgid "Save file"
+msgstr "Файлды сактоо"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Көчүрүү ишке ашпады"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Сиз өзүңүздүн машинаңызга төмөнкү пакетти орноткону жатасыз:\n"
+"\n"
+"%s\n"
+"\n"
+"Сиз аны жөн гана сактап алсаңыз болот. Сиздин тандооңуз?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - hdlist файлдардын түзүүгө мажбурлоо.\n"
+msgid "Install it"
+msgstr "Аны орнотуу"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes опциясы --parallel менен чогуу гана колдонулат"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"[%s] каталогу алдагачан бар, баг жөнүндө билдирүү үчүн башка каталог "
+"колдонуңуз же аны өчүрүңүз"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Баг отчету үчүн [%s] каталогун түзүүгө болбоду"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - кийинки пакет-баштапкы пакет (--src сыяктуу).\n"
+msgid "Copying failed"
+msgstr "Көчүрүү ишке ашпады"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "%s орнотулууда"
+msgid "Only superuser is allowed to install packages"
+msgstr "Суперколдонуучу гана пакеттерди орното алат"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "[%s] булагынын rpm файлдары окулууда"
+msgid "One of the following packages is needed:"
+msgstr "Төмөнкү пакеттердин бири талап кылынат:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
+msgid "What is your choice? (1-%d) "
+msgstr "Сиздин тандооңуз? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Package installation..."
+msgstr "Пакет орнотулууда..."
+
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Инициализациялоо жүрүп жатат..."
+
+#: ../urpmi:435
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --auto         - сунушталгандардын ичинен пакетти автоматтык тандоо.\n"
+"Талап кылынган кээ бир пакеттерди орноттууга болбойт:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Алып салуу ишке ашпады"
+msgid "do you agree ?"
+msgstr "макулсузбу ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - дайыма up-to-date болгон, виртуалдык булак түзүү\n"
-"                   file:// протоколу гана колдонулушу мүмкүн.\n"
+"Орнотууну улантууга болбойт, себеби башкаларын жаңылоо\n"
+"үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "%s пакети табылбады."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып салуу талап кылынат:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "\"%s\" булагы алынып салынууда"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат (%d Мб)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"--distrib менен кошо <hdlist файлынын салыштырма жолун> көрсөтүүнүн кереги "
-"жок"
+"Төмөнкү көз карандылыктарды орнотуу үчүн сиз root болушуңуз керек:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Калтыруу"
+msgid "unable to get source packages, aborting"
+msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - кийинки пакет-баштапкы пакет (-s сыяктуу).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - спецификалык чөйрөнү колдонуу (демейде\n"
-"                   ката жөнүндө отчет).\n"
+msgid "Press Enter when ready..."
+msgstr "Даяр болгон соң, Enter басыңыз..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - үтүр менен бөлүнгөп саптарга ылайык булактарды сорттоо.\n"
+msgid "Downloading package `%s'..."
+msgstr "`%s' пакети жүктөлүүдө..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% / %s аткарылды, ETA = %s, ылдамдыгы = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "\"%s\" булагын түзүүгө болбоду\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% аткарылды, ылдамдыгы = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
+msgid "The following packages have bad signatures"
+msgstr "Төмөнкү пакеттердин сигнарурасы туура эмес"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - конфигди urpmi.addmedia аргументи көрсөткөн формада "
-"дамптоо.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Орнотууну улантууну каалайсызбы ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Төмөнкү көз карандылыктарды орнотуу үчүн сиз root болушуңуз керек:\n"
+"Орнотуу ишке ашпады, кээ бир файлдар жок:\n"
 "%s\n"
+"Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - changelog чыгаруу.\n"
+msgid "Installation failed"
+msgstr "Орнотуу ишке ашпады"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" үчүн тизме файлына жетүүгө болбоду, булак четке кагылды"
+msgid "distributing %s"
+msgstr "%s бөлүштүрүлүүдө"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - оң кашаа, туюнтмалардын группасын жабат.\n"
+msgid "installing %s"
+msgstr "%s орнотулууда"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch табылбады, колдоого ээ webfetch: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "[%s] hdlist файлы текшерилүүдө"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Көз карадылыктарды эске албай орнотуп көрөйүнбү? (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlists файлы көчүрүлүүдө..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
+msgid "%d installation transactions failed"
+msgstr "%d орнотуу транзакциялары ишке ашпады"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"\"%s\" виртуалдык булагынын url'и бош болушу керек, булак четке кагылды"
+msgid "Installation is possible"
+msgstr "Орнотууга мүмкүн"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - buildhost: түзүүчү хост тэгин чыгаруу.\n"
+msgid "Everything already installed"
+msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Эч нерсе"
+msgid "restarting urpmi"
+msgstr "urpmi кайра ишке киргизилүүдө"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"колдонулушу: urpmi.addmedia [опциялар] <аты> <url> [with <салыштырма_жол>]\n"
+"<url> төмөнкүнүн бири:\n"
+"       file://<жол>\n"
+"       ftp://<логин>:<пароль>@<хост>/<жол> <hdlist салыштырма файл аты>\n"
+"       ftp://<хост>/<жол> <hdlist салыштырма файл аты>\n"
+"       http://<хост>/<жол> <hdlist салыштырма файл аты>\n"
+"       removable://<жол>\n"
+"\n"
+"жана [опциялар] төмөндөгүлөрдөн\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "параллелдик режим үчүн байланышкан булак колдонулууда: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - жаңылоо булагын түзүү.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s бириктирилүүдө"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - synthesis файлын издөө жана аны колдонуу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"\"%s\" булагын сактап калуу мүмкүн эмес, себеби файл тизмесин башка булак "
-"колдонууда"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - hdlist файлын издөө жана аны колдонуу.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - synthesis же hdlist файлын издөөгө\n"
+"                    аракет кылбоо.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - автоматтык түрдө бардык булактарды орнотуу\n"
+"                   булагынан түзүү.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% / %s аткарылды, ETA = %s, ылдамдыгы = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - дистрибутивдин XXX бөлүгү үчүн автоматтык түрдө\n"
+"                    булак түзүү, XXX конфигурацияланган main, contrib, "
+"updates\n"
+"                    же каалагандай башка нерсе болушу мүмкүн ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - күзгүлөрдүн тизмеси үчүн көрсөтүлгөн url\n"
+"                   колдонуу, алдынала колдонулганы %s \n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - дистрибутивдин көрсөтүлгөн версиясын колдонуу,\n"
+"                   алдынала, орнотулган mandrake-release пакети берген\n"
+"                  кабардагы дистрибутив версиясы колдонулат.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - эч качан пакетти алып салууну сурабоо, орнотууну "
-"токтотуу.\n"
+"  --arch         - көрсөтүлгөн архитектураны колдонуу, алдынала\n"
+"                   орнотулган mandrake-release пакетинин архитектурасы\n"
+"                   колдонулат.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq версиясы %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
+"  --virtual      - дайыма up-to-date болгон, виртуалдык булак түзүү\n"
+"                   file:// протоколу гана колдонулушу мүмкүн.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - MD5SUM файлын текшербөө.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - группаларды наамдары менен кошо чыгаруу.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - башсаптар (headers) кэшинин каталогун тазалоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" булагы тандалган эмес"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - hdlist файлдардын түзүүгө мажбурлоо.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Суперколдонуучу гана пакеттерди орното алат"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "cooker дистрибутивинин жаңылоосун кошууга болбойт\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "күзгүлөр, мындан: %s, кабыл алынууда ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" үчүн hdlist файлы табылбады, булак четке кагылды"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"--distrib менен кошо <hdlist файлынын салыштырма жолун> көрсөтүүнүн кереги "
+"жок"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - майда транзакциянын узундугу, алдыалынганы %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "\"%s\" булагын жаңылоого болбоду\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - сол кашаа, туюнтмалардын группасын ачат.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist файлынын салыштырма жолу> жок\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
-" \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери өтө эле көп "
+msgid "`with' missing for network media\n"
+msgstr "тармактык булак үчүн `with' жок\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - бинардык AND оператору, эгер туюнтмалардын экөө\n"
-"                    тең чындык болсо true кайтарылат.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "\"%s\" булагын түзүүгө болбоду\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"\"%s\" булагына жетүүгө болбойт,\n"
-"бул ката сиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
-"мүмкүн."
+"колдонулушу: urpmi.removemedia [-a] <аты> ...\n"
+"мында: <аты> алынып салынуучу булак аты.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - group: группа тэгин чыгаруу.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - бардык булактарды тандоо.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - үтүр менен бөлүнүп көрсөтүлгөн булактарды гана колдонуу.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "транзакция түзүүгө мүмкүн эмес"
+"\n"
+"белгисиз опциялар: '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm файлдарын \"%s\" булагынан кабыл алуу жүрүп жатат..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"алып салууга эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Сиз төмөнкү баштапкы пакетти тандап алдыңыз:\n"
-"\n"
-"%s\n"
-"\n"
-"Мүмкүн сизге муну орнотуунун зарылчылыгы жоктур (муну\n"
-"орнотуу баштапкы кодду модификациялап андан кийин\n"
-"компиляциялоо мүмкүнчүлүгүн берет).\n"
-"Эмне кылууну каалайсыз?"
+"алынып салынуучу пункт жок\n"
+"(%s ичинен бири)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s бөлүштүрүлүүдө"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"колдонулушу: urpmi.update [опциялар] <аты> ...\n"
+"мында: <аты> жаңылануучу булак аты.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Орнотуу ишке ашпады"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - жаңылоо булагын гана жаңылоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "[%s] конфиг файлын жазуу"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - gpg ачкычын жаңылоого мажбурлоо.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - чыкпоочу бардык булактарды тандоо.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - epoch: epoch тэгин чыгаруу.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "жаңылоого эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - орнотуу алдында rpm сигнатурасын текшерүү\n"
-"                   (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
+"жаңылоо үчүн пунк жок\n"
+"(%s ичинен бири)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf версиясы %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Бул эркин программалык камсыздоо жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - мүмкүн болгон пакеттер тизмеси.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - жаңылоо булагын түзүү.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - мүмкүн болгон булактар тизмеси.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - мүмкүн болгон булактар тизмеси жана алардын url-дери.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - издөөнү так эмес логиканын негизинде көрсөтүү(--fuzzy "
-"сыяктуу).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
+"  --dump-config  - конфигди urpmi.addmedia аргументи көрсөткөн формада "
+"дамптоо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists файлында туура эмес \"%s\" hdlist дескриптору"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - --parallel колдонуудагы мүмкүн болгон түйүндөр тизмеси.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "%s алынып салынууда"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - мүмкүн болгон параллель алиастар тизмеси.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - дистрибутивдин XXX бөлүгү үчүн автоматтык түрдө\n"
-"                    булак түзүү, XXX конфигурацияланган main, contrib, "
-"updates\n"
-"                    же каалагандай башка нерсе болушу мүмкүн ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - size: өлчөмү тэгин чыгаруу.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s сактоо үчүн"
+"  --headers      - stdout үчүн urpmi db санап көрсөткөн пакеттердин\n"
+"                   башсаптарын чыгаруу (root үчүн гана).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s канаатанбагандыгынан"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - жүктөө алдында пакеттердин баштапкы коддорун чыгаруу "
+"(root үчүн гана).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Пакеттерди автоматтык орнотуу...\n"
-"Сиз %s пакетин орнотууну талап кылдыңыз\n"
+"  --use-distrib  - иштөө учурунда distrib дарагынан urpmi-ди конфигдөө.\n"
+"                   Опция дистрибутивди суроо-талабына уруксат берет.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi берилиштер базасы кулпуланган"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - changelog чыгаруу.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --resume       - жарым-жартылай кабыл алынган файлдарды жүктөөнү\n"
-"                   улантуу (--no-resume муну өчүрөт, алдынала өчүрүлгөн).\n"
+"  -d             - пакеттерди көз карандылыктары үчүн кеңейтилген суроо-"
+"талап.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - жаңыраак версиясы орнотулган болсо пакетти алып салуу.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - MD5SUM файлын текшербөө.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - пакетти алып салууда кеңири маалымат чыгаруу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - кректелген пакеттерди тескери тартипте издөө.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Сиз өзүңүздүн машинаңызга төмөнкү пакетти орноткону жатасыз:\n"
-"\n"
-"%s\n"
-"\n"
-"Сиз аны жөн гана сактап алсаңыз болот. Сиздин тандооңуз?"
+"  -i             - керектүү информацияны окууга ыңгайлуу формада чыгаруу.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr ""
-"  --fuzzy        - издөөнү так эмес логиканын негизинде көрсөтүү (-y "
-"сыяктуу).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - группаларды наамдары менен кошо чыгаруу.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
-"  -u             - жаңыраак версиясы орнотулган болсо пакетти алып салуу.\n"
+"  -r             - версиясын жана релизин наамдары менен кошо чыгаруу.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - hdlist файлын издөө жана аны колдонуу.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "%s жоктугунан"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  командалык сапта көрсөтүлгөн наамдар же rpm файлдар суралды.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - жаңылоо булагын гана колдонуу.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes опциясы --parallel менен чогуу гана колдонулат"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"колдонулушу: urpmi.update [опциялар] <аты> ...\n"
-"мында: <аты> жаңылануучу булак аты.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "\"%s\" бар булагынан аттап өтүү аракети, калтырылды"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - туура орнотулгандыгын текшерүү мүмүкүнчүлүгү.\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s орнотуу үчүн төмөнкү пакеттердин бири талап кылынат:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq версиясы %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Бул эркин программалык камсыздоо жана аны GNU GPL\n"
+#~ "шартынын негизинде таркатууга болот.\n"
+#~ "\n"
+#~ "колдонулушу:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Белгисиз webfetch `%s' !!!\n"
diff --git a/po/lt.po b/po/lt.po
index 1d4d4f17..89417318 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2001-03-04 15:40+0200\n"
 "Last-Translator: Mykolas Norvaišas <Myka@centras.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -36,1810 +36,1842 @@ msgstr "TtYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "įdiegiamas %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Automatinis paketų įdiegimas...\n"
+"Jūsų užklaustų paketų įdiegimas %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr ""
+msgid "Is this OK?"
+msgstr "Ar taip gerai?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - parodyti šį pagalbos langa.\n"
+msgid "Ok"
+msgstr "Gerai"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Vienas iš šių paketų yra reikalingas."
+#: ../_irpm:36 ../urpm/msg.pm:41
+#, c-format
+msgid "Cancel"
+msgstr "Nutraukti"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (T/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr ""
+msgid "%s: command not found\n"
+msgstr "%s: komanda nerasta\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "viskas ir taip jau įdiegta"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - parodyti šį pagalbos langa.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Koks Jūsų pasirinkimas? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
+#, fuzzy, c-format
+msgid "syntax error in config file at line %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpm.pm:209
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "...retrieving failed: %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpm.pm:222
+#, c-format
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:249
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
+
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Package installation..."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
+#, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr ""
+
+#: ../urpm.pm:278
 #, fuzzy, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:301
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Įdiegimas nepavyko"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atsiprašau, blogas pasirinkimas, pakartokit\n"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Choose location to save file"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:368
 #, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Šiuose paketuose yra %s: %s\n"
+msgid "unable to write config file [%s]"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Įdiegimas nepavyko"
+msgid "write config file [%s]"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Vienas iš šių paketų yra reikalingas."
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:441
 #, fuzzy, c-format
-msgid "no package named %s"
-msgstr "nėra paketo su tokiu pavadinimu %s\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:452
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpmi.removemedia:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+#: ../urpm.pm:517 ../urpm.pm:902
+#, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
-"kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' tūkstama ftp laikmena\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmq:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "unknown package"
+msgid "skipping package %s"
 msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Įdiegimas nepavyko"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
+msgid "would install instead of upgrade package %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (T/n) "
-
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose mode.\n"
+msgid "virtual medium need to be local"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "Ruošiama įdiegimui..."
+msgid "added medium %s"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, fuzzy, c-format
+msgid "...copying failed"
+msgstr "Įdiegimas nepavyko"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid "retrieving hdlists file..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, fuzzy, c-format
-msgid "Press Enter when ready..."
-msgstr "Prašome spausti 'enter', kada bus baigta..."
-
-#: ../urpmi.removemedia:1
-#, fuzzy, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr "nežinomi nustatymai \"%s\"\n"
+msgid "...retrieving failed: %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+#: ../urpm.pm:783
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nerasta\n"
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "retrieving hdlists file..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "Įdiegimas nepavyko"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "added medium %s"
-msgstr ""
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
+#, fuzzy, c-format
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid "syntax error in config file at line %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:1398
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, fuzzy, c-format
-msgid "in order to install %s"
+msgid "no hdlist file found for medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
+#: ../urpm.pm:1541
+#, fuzzy, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
-#, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+#: ../urpm.pm:1579
+#, fuzzy, c-format
+msgid "unable to write list file of \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
+msgid "writing list file for medium \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1588
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "nothing written in list file for \"%s\""
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
+#: ../urpm.pm:1610
+#, fuzzy, c-format
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmq:1
+#: ../urpm.pm:1613
+#, fuzzy, c-format
+msgid "unable to import pubkey file of \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:1679
+#, fuzzy, c-format
+msgid "reading headers from medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
+#, fuzzy, c-format
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:1745
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
+#: ../urpm.pm:1893
+#, fuzzy, c-format
+msgid "mounting %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1906
+#, fuzzy, c-format
+msgid "unmounting %s"
+msgstr "įdiegiamas %s\n"
+
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "relocated %s entries in depslist"
 msgstr ""
-"trūksta įrašo atnaujinimui\n"
-"(vienas iš %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "trying to promote %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, fuzzy, c-format
-msgid "unable to remove package %s"
+msgid "invalid rpm file name [%s]"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "retrieving rpm file [%s] ..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"tūksta įrašo išmetimui\n"
-"(vienas iš %s)\n"
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid "  -a             - select all media.\n"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "Missing signature (%s)"
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+#: ../urpm.pm:2076
+#, fuzzy, c-format
+msgid "no package named %s"
+msgstr "nėra paketo su tokiu pavadinimu %s\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+#: ../urpm.pm:2079 ../urpme:88
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Šiuose paketuose yra %s: %s\n"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (T/n) "
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "malformed input: [%s]"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpme:1
-#, c-format
-msgid "removing package %s will break your system"
-msgstr ""
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "rpm duomenų bazės patikrinimas nepavyko\n"
 
-#: ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
+#, fuzzy, c-format
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:2561
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
+#: ../urpm.pm:2574
+#, fuzzy, c-format
+msgid "unable to access medium \"%s\""
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2642
+#, fuzzy, c-format
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "do you agree ?"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "removing package %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving done"
-msgstr ""
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "nėra paketo su tokiu pavadinimu %s\n"
+msgid "unable to install package %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "in order to keep %s"
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3035
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpm.pm:3047
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "due to conflicts with %s"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atsiprašau, blogas pasirinkimas, pakartokit\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:36
 #, c-format
-msgid "Preparing..."
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr ""
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - parodyti šį pagalbos langa.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "Įdiegimas nepavyko"
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose mode.\n"
+
+#: ../urpme:50
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "nėra paketo su tokiu pavadinimu %s\n"
+
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "nėra paketo su tokiu pavadinimu %s\n"
+
+#: ../urpme:93
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpme:95
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Vienas iš šių paketų yra reikalingas."
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
+
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+
+#: ../urpme:115
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:27
 #, c-format
 msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#, c-format
+msgid "  --update       - use only update media.\n"
 msgstr ""
-"naudojimas: urpmi.addmedia [--update] <name> <url>\n"
-"kur <url> yra vienas iš\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <reliatyviu bylos "
-"hdlistvardu>\n"
-"       ftp://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
-"       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
-"       removable_<device>://<path>\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "...copying done"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "error registering local packages"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Šiuose paketuose yra %s: %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmf:44
+#, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmf:46
+#, c-format
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:47
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "Save file"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: negai perskaityti rpm bylos \"%s\"\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write config file [%s]"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmf:50
+#, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:55
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relatyviu keliu iki hdlist> trūksta\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Vienas iš šių paketų yra reikalingas."
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:61
 #, c-format
-msgid "unrequested"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:62
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:63
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:64
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmq:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:72
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:82
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unmounting %s"
-msgstr "įdiegiamas %s\n"
-
-#: ../urpmi.update:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nėra ką atnaujinti (pridėti laikmenai naudokite urpmi.addmedia)\n"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "restarting urpmi"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "Įdiegimas nepavyko"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:95
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:96
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "nėra paketo su tokiu pavadinimu %s\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "selecting multiple media: %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
-#, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nėra ką atnaujinti (pridėti laikmenai naudokite urpmi.addmedia)\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../rpm-find-leaves:1
-#, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - parodyti šį pagalbos langa.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Ar taip gerai?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmf:1
+#: ../urpmi:141
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "įdiegimas nepavyko"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:204
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:212
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:213
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "įdiegiamas %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "Save file"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpme:1
-#, c-format
-msgid "Removing failed"
-msgstr ""
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+msgid "Copying failed"
+msgstr "įdiegimas nepavyko"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<relatyviu keliu iki hdlist> trūksta\n"
+msgid "Only superuser is allowed to install packages"
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Nutraukti"
+msgid "One of the following packages is needed:"
+msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Koks Jūsų pasirinkimas? (1-%d)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Ruošiama įdiegimui..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+#: ../urpmi:455
+#, fuzzy, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
+"kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:461
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"kaikuriuos paketus reikia išmesti prieš atnaujinant, tai dar nepalaikoma \n"
 
-#: ../urpmi:1
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Priklausomybių patenkinimui, bus įdiegti šie paketai(%d Mb)"
+
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
 "%s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
+msgid "unable to get source packages, aborting"
+msgstr "negaliu gauti pirminių bylų, nutraukiu"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prašome įkišti laikmeną pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../urpmf:1
-#, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+#: ../urpmi:541
+#, fuzzy, c-format
+msgid "Press Enter when ready..."
+msgstr "Prašome spausti 'enter', kada bus baigta..."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+#: ../urpmi:585
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
+msgid "The following packages have bad signatures"
+msgstr "Šiuose paketuose yra %s: %s\n"
 
-#: ../urpmf:1
+#: ../urpmi:620
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "Do nothing"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "Installation failed"
+msgstr "Įdiegimas nepavyko"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "mounting %s"
+msgid "distributing %s"
 msgstr "įdiegiamas %s\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "įdiegiamas %s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:688
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "negaliu gauti pirminių bylų, nutraukiu"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:712
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
 
-#: ../urpmi:1
+#: ../urpmi:731
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+msgid "%d installation transactions failed"
+msgstr "Įdiegimas nepavyko"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+msgid "Installation is possible"
+msgstr "Įdiegimas nepavyko"
 
-#: ../urpmi:1
+#: ../urpmi:783
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
+msgid "Everything already installed"
+msgstr "viskas ir taip jau įdiegta"
 
-#: ../urpmq:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"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"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"naudojimas: urpmi.addmedia [--update] <name> <url>\n"
+"kur <url> yra vienas iš\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <reliatyviu bylos "
+"hdlistvardu>\n"
+"       ftp://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
+"       http://<host>/<path> with <relatyviu hdlist bylos vardu>\n"
+"       removable_<device>://<path>\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmi.addmedia:57
+#, c-format
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
+
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "retrieving mirrors at %s ..."
 msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
+#, fuzzy, c-format
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<relatyviu keliu iki hdlist> trūksta\n"
+
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relatyviu keliu iki hdlist> trūksta\n"
+
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "distributing %s"
-msgstr "įdiegiamas %s\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' tūkstama ftp laikmena\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "Installation failed"
-msgstr "Įdiegimas nepavyko"
+msgid "unable to create medium \"%s\"\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "naudojimas: urpmi.addmedia <vardas> <url>"
 
-#: ../urpmi.update:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:39
+#, fuzzy, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr "nežinomi nustatymai \"%s\"\n"
+
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr ""
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nėra ką atnaujinti (pridėti laikmenai naudokite urpmi.addmedia)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"tūksta įrašo išmetimui\n"
+"(vienas iš %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prašome įkišti laikmeną pavadintą \"%s\", į įrenginį [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "Ok"
-msgstr "Gerai"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nėra ką atnaujinti (pridėti laikmenai naudokite urpmi.addmedia)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:75
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"trūksta įrašo atnaujinimui\n"
+"(vienas iš %s)\n"
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
-
-#: ../urpmi.addmedia:1
+#: ../urpmq:38
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:53
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Automatinis paketų įdiegimas...\n"
-"Jūsų užklaustų paketų įdiegimas %s\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "urpmi database locked"
-msgstr "rpm duomenų bazės patikrinimas nepavyko\n"
-
-#: ../urpmi:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "Tik root vartotojas gali įdiegti vietinius paketus"
+#: ../urpmq:58
+#, c-format
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:87
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "  -l             - list files in package.\n"
+msgstr ""
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
+#: ../urpmq:150
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr ""
+
+#: ../urpmq:327
+#, c-format
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#, fuzzy
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Vienas iš šių paketų yra reikalingas."
+
 #, fuzzy
 #~ msgid "copy failed: %s"
 #~ msgstr "Įdiegimas nepavyko"
diff --git a/po/lv.po b/po/lv.po
index aa84e2a2..5bc0a588 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2002-09-27 17:43+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -37,846 +37,773 @@ msgstr "jJYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "tiek instalēta %s\n"
+
+#: ../_irpm:33
+#, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automātiski veidot visas vides no instalācijas datu "
-"nesēja.\n"
+"Automātikā pakotņu uzstādīšana...\n"
+"Jūs lūdzāt uzstādīt pakotni %s\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to open rpmdb"
-msgstr "nav iespējams reģistrēt rpm failu"
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, c-format
+msgid "Is this OK?"
+msgstr "Vai piekrītat?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+msgid "Ok"
+msgstr "Labi"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Atcelt"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "nevaru noņemt pakotni %s"
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: komanda nav atrata\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "viss jau ir instalēts"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - izvadīt šo palīdzības ziņojumu.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "unknown protocol defined for %s"
+msgstr "Nezināms protokols definēts priekš %s"
+
+#: ../urpm.pm:79
+#, c-format
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
+msgid "unable to handle protocol: %s"
+msgstr "nav iespējams izmantot protokolu: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kāda ir jūsu izvēle? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "sintakses kļūda konfigurācijas failā, rindā %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "atradu %d iesākumus kešatmiņā"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
+"ignorēts"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ir vairākas pakotnes ar vienādu rpm faila vārdu \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
+"ignorēts"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - norādīt lietotāja vārdu un paroli lietošanai\n"
-"                   priekš proxy autentifikācijas (formāts ir <lietotājs:"
-"parole>).\n"
+"nevaru parūpēties par datu nesēju \"%s\", jo saraksta failu lieto jau cits "
+"datu nesējs"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
+"nevar izmantor vārdu \"%s\" priekš bezvārda datu nesēja, jo vārds ir jau "
+"izmantots"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "atgūstu rpm failus..."
-
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, fuzzy, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...atgūšana neizdevās: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nevaru inspicēt \"%s\" saraksta failu, datu nesējs tiek ignorēts"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
 
-#: ../urpmf:1
-#, c-format
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nevar piekļūt \"%s\" saraksta failam, datu nesējs tiek ignorēts"
+
+#: ../urpm.pm:249
+#, fuzzy, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
+"ignorēts"
 
-#: ../urpmi:1
-#, c-format
-msgid "Package installation..."
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
+"ignorēts"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nederīgs rpm faila vārds [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nevaru atrast \"%s\" hdlist failu, datu nesējs tiek ignorēts"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
+"nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Instalēšana neizdevās"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, fuzzy, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
+"nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nevaru inspicēt \"%s\" saraksta failu, datu nesējs tiek ignorēts"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, fuzzy, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
-
-#: ../urpm.pm:1 ../urpme:1
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sekojošas pakotnes satur %s: %s"
+msgid "taking removable device as \"%s\""
+msgstr "ņemu noņemamo ierīci, kā \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalēšana neizdevās"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
 
-#: ../urpmi:1
-#, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - lietot X saskarni.\n"
+#: ../urpm.pm:352 ../urpm.pm:355
+#, fuzzy, c-format
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
+msgid "unable to write config file [%s]"
+msgstr "nevar saglabāt konfigurācijas failu [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
+msgid "write config file [%s]"
+msgstr "rakstu konfigurācijas failu [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "nevaru noņemt pakotni %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nav iespējams piekļūt rpm failam [%s]"
+
+#: ../urpm.pm:423
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:441
 #, c-format
-msgid "no package named %s"
-msgstr "nav pakotnes ar nosaukumu %s"
+msgid "unable to use parallel option \"%s\""
+msgstr "nav iespējams lietot paralēlo opciju \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
+#: ../urpm.pm:452
+#, fuzzy, c-format
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
+msgid "examining synthesis file [%s]"
+msgstr "eksaminēju synthesis failu [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Pielietojums: urpmi.removemedia [-a] <vārds> ...\n"
-"kur <vārds> ir datu nesējs, ko noņemt.\n"
+msgid "examining hdlist file [%s]"
+msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, fuzzy, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
-"Sekojošas pakotnes ir jānoņem, lai uzlabotu citas:\n"
-"%s\n"
-"vai piekrītat?"
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' trūkst priekš ftp datu avota\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
+"ignorēts"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "nezināma pakotne"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalēšana ir iespējama"
+msgid "performing second pass to compute dependencies\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sekojošas pakotnes ir jānoņem, lai uzlabotu citas:\n"
-"%s\n"
-"vai piekrītat?"
+msgid "skipping package %s"
+msgstr "nav pakotnes ar nosaukumu %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Lai apmierinātu atkarības, tiks instalētas sekojošas pakotnes (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
+msgid "unable to open rpmdb"
+msgstr "nav iespējams reģistrēt rpm failu"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "medium \"%s\" already exists"
+msgstr "datu nesējs \"%s\" jau eksistē"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - runīgais režīms.\n"
+msgid "added medium %s"
+msgstr "pievienoju datu nesēju %s."
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+msgid "copying hdlists file..."
+msgstr "kopēju hdlists failu..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - drukāt visas iezīmes."
+msgid "...copying failed"
+msgstr "...kopēšana veikta"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "...copying done"
+msgstr "...kopēšana veikta"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, fuzzy, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
-"ignorēts"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "retrieving hdlists file..."
+msgstr "atgūstu hdlists failu..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Nospiediet Enter, kad gatavs..."
+msgid "...retrieving done"
+msgstr "...atgūšana veikta"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nezināmas opcijas '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...atgūšana neizdevās: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nederīgs hdlist apraksts \"%s\" hdlists failā"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
+#: ../urpm.pm:767
+#, fuzzy, c-format
+msgid "selecting multiple media: %s"
+msgstr "izvēlos vairākas vides: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "būvēju hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpm.pm:996
+#, fuzzy, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
+"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
+"ignorēts"
+
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "kopēju \"%s\" apraksta failu ..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nav atrata\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, fuzzy, c-format
-msgid "unable to register rpm file"
-msgstr "nav iespējams piekļūt rpm failam [%s]"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nav iespējams izmantot protokolu: %s"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "atgūstu hdlists failu..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] kopēšana neizdevās"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "pievienoju datu nesēju %s."
+msgid "reading rpm files from [%s]"
+msgstr "nolasu rpm failus no [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "neizdevās nolasīt rpm failus no [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "no rpm files found from [%s]"
+msgstr "netika atrasti rpm faili no [%s]"
+
+#: ../urpm.pm:1333
+#, fuzzy, c-format
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "atgūstu \"%s\" apraksta failu..."
+
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
+
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintakses kļūda konfigurācijas failā, rindā %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
+msgid "no hdlist file found for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - lietot norādīto HTTP proxy, porta numurs tiek pieņemts,\n"
-"                   ka ir 1080 pēc noklusēšanas (formāts ir <proxy_hosts[:"
-"ports]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fails [%s] jau tiek lietots tai pašā datu nesējā \"%s\""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "nevaru instalēt pakotni %s"
+#: ../urpm.pm:1541
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nevaru izanalizēt \"%s\" hdlist failu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "unable to write list file of \"%s\""
+msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
+msgid "nothing written in list file for \"%s\""
+msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "nevaru noņemt pakotni %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "atgūstu \"%s\" apraksta failu..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "atgūstu rpm failus..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --serial        - drukāt iezīmi: seriālais numurs."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Nezināms protokols definēts priekš %s"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpmf:1
+#: ../urpm.pm:1679
 #, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+msgid "reading headers from medium \"%s\""
+msgstr "ielasu sākumus no datu nesēja \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "datu nesējs \"%s\" jau eksistē"
+msgid "building hdlist [%s]"
+msgstr "būvēju hdlist [%s]"
 
-#: ../_irpm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "installing %s\n"
-msgstr "tiek instalēta %s\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"atjuninājumā trūkst kāda ieraksta\n"
-"(viens no %s)\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "Nav nekā, ko noņemt.\n"
+msgid "found %d headers in cache"
+msgstr "atradu %d iesākumus kešatmiņā"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nevaru noņemt pakotni %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "izņemu %d novecojušus iesākumus no kešatmiņas"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
+msgid "mounting %s"
+msgstr "montēju %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
+msgid "unmounting %s"
+msgstr "atmontēju %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "neizdevās nolasīt rpm failus no [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "nederīgs rpm faila vārds [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+#: ../urpm.pm:1948
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "atgūstu rpm failus..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+msgid "unable to register rpm file"
+msgstr "nav iespējams piekļūt rpm failam [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "error registering local packages"
+msgstr "kļūda reģistrējot lokālās pakotnes"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
+#: ../urpm.pm:2076
+#, c-format
+msgid "no package named %s"
+msgstr "nav pakotnes ar nosaukumu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
-"ignorēts"
+msgid "The following packages contain %s: %s"
+msgstr "Sekojošas pakotnes satur %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "nepareizi izveidots ievads: [%s]"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ir vairākas pakotnes ar vienādu rpm faila vārdu \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr ""
-
-#: ../urpmi:1
-#, fuzzy, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Dažas pieprasītas pakotnes nevar tikt instalētas:\n"
-"%s\n"
-"vai piekrītat?"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "package %s is not found."
+msgstr "pakotne %s nav atrasta."
 
-#: ../urpmi:1
-#, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
+#, fuzzy, c-format
+msgid "urpmi database locked"
+msgstr "urpmi datubāze noslēgta"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "datu nesējs \"%s\" nav izvēlēts"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+#: ../urpm.pm:2561
+#, c-format
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
-"nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...atgūšana veikta"
+msgid "unable to access medium \"%s\""
+msgstr "nav iespējams piekļūt datu nesējam \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "nepareizi izveidots ievads: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "nav pakotnes ar nosaukumu %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "atgūstu rpm failus..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr ""
+msgid "Preparing..."
+msgstr "Sagatavoju..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versija %s\n"
-"Autortiesības (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Šī ir brīva programmatūra, un var tikt izplatīta saskaņā ar GNU GPL.\n"
-"\n"
-"pielietojums:\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
+msgid "unable to create transaction"
+msgstr "nevar izveidot datu nesēju \"%s\"\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nevar noteikt datu nesēju no hdlist faila [%s]"
+msgid "removing package %s"
+msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nevaru izanalizēt \"%s\" hdlist failu"
+msgid "unable to remove package %s"
+msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
-"ignorēts"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s konflikē ar %s"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "izņemu %d novecojušus iesākumus no kešatmiņas"
+msgid "unable to install package %s"
+msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nevar atjaunot datu nesēju \"%s\"\n"
+#: ../urpm.pm:3009 ../urpm.pm:3042
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "wget nav atrodams\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "due to unsatisfied %s"
 msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
-"ignorēts"
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
-msgstr "Sagatavoju..."
+#: ../urpm.pm:3011
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+msgid "in order to keep %s"
+msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
+msgid "in order to install %s"
+msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
+msgid "due to conflicts with %s"
+msgstr "%s konflikē ar %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] kopēšana neizdevās"
-
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
+msgid "Missing signature (%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
-"nevar izmantor vārdu \"%s\" priekš bezvārda datu nesēja, jo vārds ir jau "
-"izmantots"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
-"ignorēts"
 
-#: ../urpme:1
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -892,620 +819,659 @@ msgstr ""
 "\n"
 "pielietojums:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"Pielietojums: urpmi.addmedia [opcijas] <vārds> <url> [with "
-"<relatīvais_ceļš>]\n"
-"kur <url> ir viens no\n"
-"       file://<ceļš>\n"
-"       ftp://<lietotāja_vārds>:<parole>@<hosts>/<ceļš> with <hdlist "
-"relatīvais faila vārds>\n"
-"       ftp://<host>/<ceļš> with <hdlist relatīvais faila vārds>\n"
-"       http://<host>/<ceļš> with <hdlist relatīvais faila vārds>\n"
-"       removable://<ceļš>\n"
-"\n"
-"un [opcijas] ir no\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "...copying done"
-msgstr "...kopēšana veikta"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nav iespējams lietot paralēlo opciju \"%s\""
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
+"  --test         - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access first installation medium"
-msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
-
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "virtual medium need to be local"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "error registering local packages"
-msgstr "kļūda reģistrējot lokālās pakotnes"
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "netika atrasti rpm faili no [%s]"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - runīgais režīms.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+#: ../urpme:50
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sekojošām pakotnēm ir slikti paraksti"
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "nezināmas pakotnes"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+msgid "unknown package"
+msgstr "nezināma pakotne"
 
-#: ../urpmq:1
+#: ../urpme:93
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                    dota komandrindā; bez pakotnes vārda)."
+msgid "removing package %s will break your system"
+msgstr "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
+
+#: ../urpme:95
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
+
+#: ../urpme:106
 #, c-format
-msgid "unable to install package %s"
-msgstr "nevaru instalēt pakotni %s"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:111 ../urpmi:675
+#, fuzzy, c-format
+msgid "removing %s"
+msgstr "nevaru noņemt pakotni %s"
+
+#: ../urpme:115
+#, fuzzy, c-format
+msgid "Removing failed"
+msgstr "...kopēšana neizdevās"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr ""
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "nevar saglabāt konfigurācijas failu [%s]"
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmf:38
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpmf:39
+#, fuzzy, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --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"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - drukāt visas iezīmes."
 
-#: ../urpmi:1
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relative path of hdlist> trūkst\n"
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - drukāt iezīmi: izmērs."
 
-#: ../urpme:1
+#: ../urpmf:46
 #, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unrequested"
-msgstr ""
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - drukāt iezīmui: apraksts."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nav iespējams piekļūt rpm failam [%s]"
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, fuzzy, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
+
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nav iespējams piekļūt rpm failam [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --serial        - drukāt iezīmi: seriālais numurs."
 
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vēlaties turpināt instalēšanu?"
+#: ../urpmf:52
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
+
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
+
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, fuzzy, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-
-#: ../urpmq:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "atmontēju %s"
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmi versija %s\n"
+"Autortiesības (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Šī ir brīva programmatūra, un var tikt izplatīta saskaņā ar GNU GPL.\n"
+"\n"
+"pielietojums:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "eksaminēju synthesis failu [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-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) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "...kopēšana veikta"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - klusais režīms.\n"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - runīgais režīms.\n"
+#: ../urpmi:91
+#, c-format
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "nezināmas pakotnes"
+#: ../urpmi:94
+#, c-format
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "selecting multiple media: %s"
-msgstr "izvēlos vairākas vides: %s"
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:96
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fails [%s] jau tiek lietots tai pašā datu nesējā \"%s\""
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:100
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nav ko noņemt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"nevar atrasta saraksta failu priekš \"%s\", datu nesējs neiks ņemts vērā"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - izvadīt šo palīdzības ziņojumu.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  --X            - lietot X saskarni.\n"
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#, c-format
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - lietot norādīto HTTP proxy, porta numurs tiek pieņemts,\n"
+"                   ka ir 1080 pēc noklusēšanas (formāts ir <proxy_hosts[:"
+"ports]>).\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
+#, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\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"
+"  --proxy-user   - norādīt lietotāja vārdu un paroli lietošanai\n"
+"                   priekš proxy autentifikācijas (formāts ir <lietotājs:"
+"parole>).\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
+#: ../urpmi:115
+#, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - nedrukāt iezīmes vārdu (noklusētais, ja iezīme nav dota"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --size          - drukāt iezīmi: izmērs."
+#: ../urpmi:119
+#, c-format
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - lietot X saskarni.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpmi:120
+#, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Vai piekrītat?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "eksaminēju hdlist failu [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Nav nekā, ko noņemt.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "ielasu sākumus no datu nesēja \"%s\""
-
-#: ../urpmq:1
+#: ../urpmi:128
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
-
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - drukāt iezīmui: apraksts."
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "Kopēšana veikta"
+#: ../urpmi:132
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - klusais režīms.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "tiek instalēta %s\n"
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr "Nedarīt neko"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "nolasu rpm failus no [%s]"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopēju \"%s\" apraksta failu ..."
+msgid "Save file"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "...kopēšana neizdevās"
+msgid "Install it"
+msgstr "Instalēšana neizdevās"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "pakotne %s nav atrasta."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nevarēju izveidot direktoriju [%s] kļūdu ziņojumam"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "noņemu datu nesēju \"%s\""
+#: ../urpmi:243 ../urpmi:365
+#, fuzzy, c-format
+msgid "Copying failed"
+msgstr "Kopēšana veikta"
+
+#: ../urpmi:260
+#, fuzzy, c-format
+msgid "Only superuser is allowed to install packages"
+msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:396
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
+msgid "One of the following packages is needed:"
+msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "Cancel"
-msgstr "Atcelt"
+msgid "What is your choice? (1-%d) "
+msgstr "Kāda ir jūsu izvēle? (1-%d) "
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "Initializing..."
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:435
 #, fuzzy, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nav iespējams piekļūt datu nesējam \"%s\""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Dažas pieprasītas pakotnes nevar tikt instalētas:\n"
+"%s\n"
+"vai piekrītat?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nevar izveidot datu nesēju \"%s\"\n"
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Sekojošas pakotnes ir jānoņem, lai uzlabotu citas:\n"
+"%s\n"
+"vai piekrītat?"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:461
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"Sekojošas pakotnes ir jānoņem, lai uzlabotu citas:\n"
+"%s\n"
+"vai piekrītat?"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Lai apmierinātu atkarības, tiks instalētas sekojošas pakotnes (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1514,360 +1480,403 @@ msgstr ""
 "Jums jābūt root, lai instalētu sekojošas atkarības:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - drukāt visas iezīmes."
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nevar piekļūt \"%s\" saraksta failam, datu nesējs tiek ignorēts"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "unable to get source packages, aborting"
+msgstr "nevar dabūt koda pakotnes, pārtraucu"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "eksaminēju hdlist failu [%s]"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopēju hdlists failu..."
+msgid "Press Enter when ready..."
+msgstr "Nospiediet Enter, kad gatavs..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "nevaru noņemt pakotni %s"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
-"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
-"ignorēts"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
 
-#: ../urpmi:1
+#: ../urpmi:600
 #, c-format
-msgid "Do nothing"
-msgstr "Nedarīt neko"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "The following packages have bad signatures"
+msgstr "Sekojošām pakotnēm ir slikti paraksti"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "mounting %s"
-msgstr "montēju %s"
+msgid "Do you want to continue installation ?"
+msgstr "Vēlaties turpināt instalēšanu?"
 
-#: ../urpm.pm:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"nevaru parūpēties par datu nesēju \"%s\", jo saraksta failu lieto jau cits "
-"datu nesējs"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "nevar dabūt koda pakotnes, pārtraucu"
+msgid "Installation failed"
+msgstr "Instalēšana neizdevās"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
+msgid "distributing %s"
+msgstr "izplatu %s\n"
 
-#: ../urpmi:1
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "tiek instalēta %s\n"
+
+#: ../urpmi:688
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "saraksta fails priekš \"%s\" ir tukšs"
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Vai mēģināt instalēt bez atkarību pārbaudes? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
+#, c-format
+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:772
 #, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nevaru ierakstīt \"%s\" saraksta failu"
+msgid "%d installation transactions failed"
+msgstr "Instalēšana neizdevās"
 
-#: ../urpmi:1
+#: ../urpmi:780
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
+msgid "Installation is possible"
+msgstr "Instalēšana ir iespējama"
 
-#: ../urpmq:1
+#: ../urpmi:783
 #, c-format
+msgid "Everything already installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"Pielietojums: urpmi.addmedia [opcijas] <vārds> <url> [with "
+"<relatīvais_ceļš>]\n"
+"kur <url> ir viens no\n"
+"       file://<ceļš>\n"
+"       ftp://<lietotāja_vārds>:<parole>@<hosts>/<ceļš> with <hdlist "
+"relatīvais faila vārds>\n"
+"       ftp://<host>/<ceļš> with <hdlist relatīvais faila vārds>\n"
+"       http://<host>/<ceļš> with <hdlist relatīvais faila vārds>\n"
+"       removable://<ceļš>\n"
 "\n"
-"pielietojums:\n"
+"un [opcijas] ir no\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
+#, c-format
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "atgūstu \"%s\" apraksta failu..."
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "datu nesējs \"%s\" nav izvēlēts"
+#: ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Tikai root drīkst instalēt pakotnes"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automātiski veidot visas vides no instalācijas datu "
+"nesēja.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nevaru atrast \"%s\" hdlist failu, datu nesējs tiek ignorēts"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "pārāk daudz montēšanas punktu noņemamajam datu nesējam \"%s\""
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "nevar izveidot datu nesēju \"%s\"\n"
+#: ../urpmi.addmedia:130
+#, c-format
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "retrieving mirrors at %s ..."
 msgstr "atgūstu rpm failus..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "izplatu %s\n"
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "nevar atjaunot datu nesēju \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "Installation failed"
-msgstr "Instalēšana neizdevās"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path of hdlist> trūkst\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
+#, fuzzy, c-format
+msgid "`with' missing for network media\n"
+msgstr "`with' trūkst priekš ftp datu avota\n"
+
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "write config file [%s]"
-msgstr "rakstu konfigurācijas failu [%s]"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nevar izveidot datu nesēju \"%s\"\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"Pielietojums: urpmi.removemedia [-a] <vārds> ...\n"
+"kur <vārds> ir datu nesējs, ko noņemt.\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - drukāt iezīmi: izmērs."
+#: ../urpmi.removemedia:37
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"nezināmas opcijas '%s'\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nav ko noņemt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+
+#: ../urpmi.update:28
+#, c-format
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"lietojums: urpmi.update [opcijas] <vārds> ...\n"
+"kur <vārds> atjaunināmā datu nesēja vārds.\n"
 
-#: ../urpmq:1
+#: ../urpmi.update:38
 #, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:41
 #, c-format
-msgid "Ok"
-msgstr "Labi"
+msgid "  -a             - select all non-removable media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nederīgs hdlist apraksts \"%s\" hdlists failā"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "nevaru noņemt pakotni %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"atjuninājumā trūkst kāda ieraksta\n"
+"(viens no %s)\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - drukāt iezīmi: izmērs."
-
-#: ../urpm.pm:1
+#: ../urpmq:38
 #, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "nevaru instalēt pakotni %s"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../_irpm:1
+#: ../urpmq:54
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
-"Automātikā pakotņu uzstādīšana...\n"
-"Jūs lūdzāt uzstādīt pakotni %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, fuzzy, c-format
-msgid "urpmi database locked"
-msgstr "urpmi datubāze noslēgta"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmi:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+
+#: ../urpmq:57
+#, c-format
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "atgūstu \"%s\" apraksta failu..."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ņemu noņemamo ierīci, kā \"%s\""
+#: ../urpmq:62
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - drukāt visas iezīmes."
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1875,41 +1884,78 @@ msgid ""
 msgstr ""
 "  -u             - noņemt pakotni, ja ir uzinstalēta jaunāka versija.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                    dota komandrindā; bez pakotnes vārda)."
+
+#: ../urpmq:82
+#, fuzzy, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  --X            - lietot X saskarni.\n"
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmq:86
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr ""
+
+#: ../urpmq:87
+#, c-format
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:89
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget nav atrodams\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:150
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
+
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"lietojums: urpmi.update [opcijas] <vārds> ...\n"
-"kur <vārds> atjaunināmā datu nesēja vārds.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "mēģināts izvēlēties neeksistējošu datu nesēju \"%s\""
+#: ../urpmq:388
+#, c-format
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
+
+#~ 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:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #, fuzzy
 #~ msgid "copy failed: %s"
diff --git a/po/mn.po b/po/mn.po
index ed7a1409..07bee8ad 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-08-22 19:38+0200\n"
 "Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -35,815 +35,755 @@ msgstr "YyтТ"
 msgid "Nn"
 msgstr "NnүҮ"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
+msgid "installing %s\n"
+msgstr "%s-ийг суулгаж байна\n"
+
+#: ../_irpm:33
+#, fuzzy, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr "Автоматаар аас аас с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb-г нээж болсонгүй"
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, fuzzy, c-format
+msgid "Is this OK?"
+msgstr "Ок?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
+#: ../_irpm:35 ../urpm/msg.pm:40
+#, fuzzy, c-format
+msgid "Ok"
+msgstr "Ок"
 
-#: ../urpmi:1
-#, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s-ийг суулгахын тулд дараах багцуудын нэг нь шаардлагатай:"
+#: ../_irpm:36 ../urpm/msg.pm:41
+#, fuzzy, c-format
+msgid "Cancel"
+msgstr "Хүчингүй"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s багцийг устгалт"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: тушаал олдсонгүй\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - Энэ тусламжийг хэвлэх.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "бүлэг бүлэг бүлэг"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Таны сонголт юу бэ? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "config файлын %s мөрөнд бичэглэлийн алдаа"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "found %d headers in cache"
-msgstr "%d толгой кэйшид олдлоо"
+#: ../urpm.pm:174
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "энд \"%s\" гэсэн ижил rpm файл нэртэй олон багцууд байна"
+#: ../urpm.pm:180
+#, fuzzy, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "с жигсаалт"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, fuzzy, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"\n"
-" бол<user:password>"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "аас с жигсаалт бол"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, fuzzy, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "секунд"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "rpm файлыг хүлээн авч байна [%s] ..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "нэр с бол"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, fuzzy, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "жигсаалт жигсаалт"
-
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "с үгүй жигсаалт с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, fuzzy, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "жигсаалт с"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "аас с"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, fuzzy, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "бол"
-
-#: ../urpmi:1
-#, c-format
-msgid "Package installation..."
-msgstr "Багц суулгалт..."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "буруу rpm файлын нэр [%s]"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "аас с"
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
+#: ../urpm.pm:224 ../urpm.pm:2343
+#, fuzzy, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "жигсаалт аас с"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Суулгалт боломжтой"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, fuzzy, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "үгүй"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "с"
 
-#: ../urpm/msg.pm:1
-#, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Харамсалтай нь буруу сонголт байна, дахин ородоно уу!\n"
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "с жигсаалт"
 
-#: ../urpmi:1
-#, c-format
-msgid "Choose location to save file"
-msgstr ""
+#: ../urpm.pm:271
+#, fuzzy, c-format
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "с"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr ""
+#: ../urpm.pm:278
+#, fuzzy, c-format
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "жигсаалт с"
 
-#: ../urpm.pm:1 ../urpme:1
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
+#: ../urpm.pm:301
+#, fuzzy, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "жигсаалт с"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, fuzzy, c-format
-msgid "Install it"
-msgstr "%s-ийг суулгаж байна\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "жигсаалт с"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, fuzzy, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "X X"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "Цэг с"
 
-#: ../urpmi:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Дараах багцуудын нэг нь шаардлагатай:"
+#: ../urpm.pm:343
+#, fuzzy, c-format
+msgid "taking removable device as \"%s\""
+msgstr "с"
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "тийш МБ"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "с с"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, fuzzy, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"гаралт\n"
-" X текст горим"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "с"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "`%s' багцыг татан авч байна..."
+msgid "unable to write config file [%s]"
+msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, fuzzy, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Хийгдсэн"
+msgid "write config file [%s]"
+msgstr "с"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no package named %s"
-msgstr "%s нэртэй багц байхгүй байна"
+#: ../urpm.pm:412
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "с ямх с"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, fuzzy, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "Нээх"
+msgid "examining parallel handler in file [%s]"
+msgstr "ямх с"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
-"Суулгалт бүтэлгүйтэв, учир нь зарим файл байхгүй байна:\n"
-"%s\n"
-"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
 #, fuzzy, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr "<name><name> бол нэр"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr "г с вы?"
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr "с г"
+msgid "using associated media for parallel mode: %s"
+msgstr "горим"
 
-#: ../urpmq:1
+#: ../urpm.pm:441
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpme:1
-#, c-format
-msgid "unknown package"
-msgstr "үл мэдэгдэх багц"
+msgid "unable to use parallel option \"%s\""
+msgstr "с"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
-msgid "Installation is possible"
-msgstr "Суулгалт боломжтой"
-
-#: ../urpmi:1
-#, fuzzy, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr "г с вы?"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "тийш МБ"
+msgid "examining synthesis file [%s]"
+msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, fuzzy, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "с үгүй жигсаалт с"
+msgid "examining hdlist file [%s]"
+msgstr "с"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "с жигсаалт"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "аас"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "аас с"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, fuzzy, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - Ажилуулах горим.\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "секунд"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Initializing..."
-msgstr "Урьдчилан бэлдэж байна..."
+msgid "skipping package %s"
+msgstr "%s багцийг алгасаж байна"
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+#: ../urpm.pm:572
+#, fuzzy, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../urpmf:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "с"
+msgid "unable to open rpmdb"
+msgstr "rpmdb-г нээж болсонгүй"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:622
 #, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+msgid "medium \"%s\" already exists"
 msgstr "с"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "аас"
-
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "added medium %s"
 msgstr ""
-"\n"
-"үл мэдэгдэх сонголтууд '%s'\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "аас с"
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "ямх"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "жигсаалт жигсаалт"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "hdlist [%s]-ийг байгуулж байна"
+msgid "...copying failed"
+msgstr "...хуулалт бүтэлгүйтэв"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
+msgid "...copying done"
+msgstr "...хуулждууслаа"
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, fuzzy, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "үгүй"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM файлыг шалгаж байна"
+msgid "retrieving hdlists file..."
+msgstr "hdlists файлыг хүлээн авч байна..."
 
-#: ../_irpm:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: тушаал олдсонгүй\n"
+msgid "...retrieving done"
+msgstr "...хүлээн авалт дууслаа"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm файлыг бүртгэж болсонгүй"
+msgid "...retrieving failed: %s"
+msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
+#: ../urpm.pm:720
+#, fuzzy, c-format
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "хүчингүй Тодорхойлолт с ямх"
+
+#: ../urpm.pm:765
+#, fuzzy, c-format
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists файлыг хүлээн авч байна..."
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:783
+#, fuzzy, c-format
+msgid "removing medium \"%s\""
+msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "added medium %s"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "ямх"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, fuzzy, c-format
 msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr "с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "md5sum mismatch"
-msgstr ""
+#: ../urpm.pm:1004
+#, fuzzy, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "Тодорхойлолт аас с."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "аас"
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "config файлын %s мөрөнд бичэглэлийн алдаа"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM файлыг шалгаж байна"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, fuzzy, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "Нээх"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "аас с."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, fuzzy, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+#: ../urpm.pm:1105
+#, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"бол\n"
-" бол<proxyhost[:port]>"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "ямх"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "аас"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, fuzzy, c-format
-msgid "relocated %s entries in depslist"
-msgstr "с ямх"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "аас с"
 
-#: ../urpmf:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "ямх"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "аас с"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, fuzzy, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "reading rpm files from [%s]"
 msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "%s багцийг устгаж болсонгүй"
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "с."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s-ийн хувьд үл мэдэгдэх протокол тодорхойлогдсон"
+msgid "no rpm files found from [%s]"
+msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpmq:1
+#: ../urpm.pm:1333
 #, fuzzy, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "нэр"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "аас с."
 
-#: ../urpmf:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, fuzzy, c-format
-msgid "medium \"%s\" already exists"
-msgstr "с"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "аас"
 
-#: ../_irpm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "installing %s\n"
-msgstr "%s-ийг суулгаж байна\n"
+msgid "md5sum mismatch"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1483
 #, fuzzy, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr "бол г аас с"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "аас"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "Юу ч үгүй"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "үгүй с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to remove package %s"
-msgstr "%s багцийг устгаж болсонгүй"
+#: ../urpm.pm:1501 ../urpm.pm:1555
+#, fuzzy, c-format
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "с ямх с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "unable to parse hdlist file of \"%s\""
 msgstr "аас с"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1579
 #, fuzzy, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr "бол г аас с"
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid "  -a             - select all media.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "unable to write list file of \"%s\""
+msgstr "жигсаалт аас с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "с"
+msgid "writing list file for medium \"%s\""
+msgstr "жигсаалт с"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1588
 #, fuzzy, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "аас"
+msgid "nothing written in list file for \"%s\""
+msgstr "юу ч үгүй ямх жигсаалт с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "\"%s\" файлын шинжүүдийг хүлээн авч байна..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
-
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "бүлэг бүлэг бүлэг"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "жигсаалт аас с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "с жигсаалт"
+msgid "reading headers from medium \"%s\""
+msgstr "с"
+
+#: ../urpm.pm:1684
+#, c-format
+msgid "building hdlist [%s]"
+msgstr "hdlist [%s]-ийг байгуулж байна"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, fuzzy, c-format
-msgid "malformed input: [%s]"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "с"
 
-#: ../urpme:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
+msgid "found %d headers in cache"
+msgstr "%d толгой кэйшид олдлоо"
 
-#: ../urpmq:1
+#: ../urpm.pm:1749
 #, fuzzy, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "жигсаалт жигсаалт"
+msgid "removing %d obsolete headers in cache"
+msgstr "ямх"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr "г с вы?"
+#: ../urpm.pm:1893
+#, c-format
+msgid "mounting %s"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
+msgid "unmounting %s"
+msgstr "%s-ийг салгаж байна"
+
+#: ../urpm.pm:1928
+#, fuzzy, c-format
+msgid "relocated %s entries in depslist"
+msgstr "с ямх"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, fuzzy, c-format
 msgid "no entries relocated in depslist"
 msgstr "үгүй ямх"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "үгүй"
+#: ../urpm.pm:1942
+#, c-format
+msgid "invalid rpm file name [%s]"
+msgstr "буруу rpm файлын нэр [%s]"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "rpm файлыг хүлээн авч байна [%s] ..."
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "e e"
+#: ../urpm.pm:1955 ../urpm.pm:2821
+#, c-format
+msgid "unable to access rpm file [%s]"
+msgstr "[%s] rpm файл руу хандаж болсонгүй"
 
-#: ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "do you agree ?"
-msgstr ""
+msgid "unable to register rpm file"
+msgstr "rpm файлыг бүртгэж болсонгүй"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, fuzzy, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "жигсаалт с"
+msgid "error registering local packages"
+msgstr "локал"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "...retrieving done"
-msgstr "...хүлээн авалт дууслаа"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "с с"
+msgid "no package named %s"
+msgstr "%s нэртэй багц байхгүй байна"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "skipping package %s"
-msgstr "%s багцийг алгасаж байна"
+msgid "The following packages contain %s: %s"
+msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "энд \"%s\" гэсэн ижил rpm файл нэртэй олон багцууд байна"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, fuzzy, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "Нээх"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "с с"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, fuzzy, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr "с MandrakeSoft бол аас г"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"с хүчингүй жигсаалт\n"
+" бол"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "с с"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "с"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2378
+#, fuzzy, c-format
+msgid "package %s is not found."
+msgstr "с бол."
+
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, fuzzy, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "аас с"
+msgid "medium \"%s\" is not selected"
+msgstr "с бол"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, fuzzy, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "аас с"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "с с"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, fuzzy, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "с"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, fuzzy, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "ямх"
+msgid "unable to access medium \"%s\""
+msgstr "с"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2635
 #, fuzzy, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "malformed input: [%s]"
 msgstr "с"
 
-#: ../urpmi:1
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "с жигсаалт"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "с."
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2752
+#, c-format
+msgid "using process %d for executing transaction"
+msgstr ""
+
+#: ../urpm.pm:2783
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "с"
+
+#: ../urpm.pm:2786
+#, c-format
+msgid "unable to create transaction"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
+#, c-format
+msgid "removing package %s"
+msgstr "%s багцийг устгалт"
+
+#: ../urpm.pm:2796
+#, c-format
+msgid "unable to remove package %s"
+msgstr "%s багцийг устгаж болсонгүй"
+
+#: ../urpm.pm:2806
 #, fuzzy, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "с с"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
+#, c-format
+msgid "unable to install package %s"
+msgstr "%s багцийг суулгаж болсонгүй"
+
+#: ../urpm.pm:3009 ../urpm.pm:3042
+#, c-format
+msgid "due to missing %s"
+msgstr ""
+
+#: ../urpm.pm:3010 ../urpm.pm:3040
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
+
+#: ../urpm.pm:3011
 #, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "үгүй\n"
+msgid "trying to promote %s"
+msgstr "Юу ч үгүй"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "in order to keep %s"
 msgstr "ямх"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "аас с"
+msgid "in order to install %s"
+msgstr "ямх"
 
-#: ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "нэр с бол"
+#: ../urpm.pm:3092
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "с"
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
+#, c-format
+msgid "bad proxy declaration on command line\n"
+msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
 
-#: ../urpme:1
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Харамсалтай нь буруу сонголт байна, дахин ородоно уу!\n"
+
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -854,1009 +794,1110 @@ msgid ""
 "usage:\n"
 msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
+
+#: ../urpme:42 ../urpmi:83
 #, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "ямх"
+
+#: ../urpme:43 ../urpmi:124
+#, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"<name><url><relative_path><url> бол аас\n"
-"<path>\n"
-"<login><password><host><path><relative filename of hdlist>\n"
-"<host><path><relative filename of hdlist>\n"
-"<host><path><relative filename of hdlist>\n"
-"<path> г"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "аас с."
-
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "...copying done"
-msgstr "...хуулждууслаа"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "с"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "аас"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"с хүчингүй жигсаалт\n"
-" бол"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "Мөр"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "unable to access first installation medium"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
+#, fuzzy, c-format
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - Ажилуулах горим.\n"
+
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "error registering local packages"
-msgstr "локал"
+#: ../urpme:83
+#, c-format
+msgid "unknown packages"
+msgstr "үл мэдэгдэх багцууд"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+msgid "unknown package"
+msgstr "үл мэдэгдэх багц"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr ""
+msgid "removing package %s will break your system"
+msgstr "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, fuzzy, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "аас"
+msgid "Nothing to remove"
+msgstr "Юу ч үгүй"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
+msgid "Checking to remove the following packages"
+msgstr "Дараах багцуудыг устгахаар шалгаж байна"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, fuzzy, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "юу ч үгүй ямх жигсаалт с"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "тийш МБ"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr ""
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "аас"
+msgid "removing %s"
+msgstr "%s багцийг устгалт"
 
-#: ../urpmq:1
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr ""
+
+#: ../urpmf:27
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "гаралт"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s багцийг суулгаж болсонгүй"
+msgid "  --update       - use only update media.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "Save file"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
+#: ../urpmf:37 ../urpmq:48
+#, fuzzy, c-format
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "аас"
 
-#: ../urpme:1
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
+#: ../urpmf:38
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "горим"
+
+#: ../urpmf:39
+#, fuzzy, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"аяархан нэр үгүй\n"
+" горим"
+
+#: ../urpmf:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "Мөр"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "бүлэг бүлэг бүлэг"
+
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "хэмжээ хэмжээ хэмжээ"
+
+#: ../urpmf:45
+#, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, fuzzy, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "с"
+msgid "  --description  - print tag description: description.\n"
+msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "аас"
-
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "<relative path of hdlist> missing\n"
+#: ../urpmf:50
+#, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
-"с\n"
-"<relative path of hdlist>"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Дараах багцуудыг устгахаар шалгаж байна"
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "[%s] rpm файл руу хандаж болсонгүй"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "с ямх с"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "с с"
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "с"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "ямх"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - хэрэгтэй мэдээллийг хүн уншиж болохоор хэлбэрээр хэвлэх.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "нэр"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, fuzzy, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"бол\n"
-" аас\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "e e"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
+#: ../urpmf:62
+#, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"жигсаалт аас бол\n"
-" с"
 
-#: ../urpme:1
-#, c-format
+#: ../urpmf:63
+#, fuzzy, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr "бол"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "бол"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "зүүн бүлэг"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "%s-ийг салгаж байна"
+#: ../urpmf:66
+#, fuzzy, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "баруун бүлэг"
 
-#: ../urpmi.update:1
+#: ../urpmf:114
 #, fuzzy, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "юу ч үгүй"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr "бол г с"
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, fuzzy, c-format
-msgid "        %s%% completed, speed = %s"
+msgid "using specific environment on %s\n"
 msgstr "с"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, fuzzy, c-format
-msgid "examining synthesis file [%s]"
-msgstr "с"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, fuzzy, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Reyna т N "
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "аас"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "...copying failed"
-msgstr "...хуулалт бүтэлгүйтэв"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "аас с"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "аяархан горим"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "горим"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:88
 #, c-format
-msgid "unknown packages"
-msgstr "үл мэдэгдэх багцууд"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "нэр"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "т"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, fuzzy, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "с ямх с"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "бол с"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:94
 #, fuzzy, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "юу ч үгүй"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "үгүй"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
+#, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+
+#: ../urpmi:96
 #, fuzzy, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "жигсаалт с"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "ямх"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:98
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - Энэ тусламжийг хэвлэх.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
+#: ../urpmi:104
+#, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
-msgstr "бол г с"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, 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"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr ""
 "\n"
-"usage:\n"
-msgstr "с MandrakeSoft бол аас г"
+" үгүй бол"
 
-#: ../urpmf:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"аяархан нэр үгүй\n"
-" горим"
+"бол\n"
+" бол<proxyhost[:port]>"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "Мөр"
-
-#: ../urpm.pm:1
-#, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
+"\n"
+" бол<user:password>"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:115
 #, fuzzy, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
-msgstr "бол аас\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr "гаралт ямх\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:119
 #, fuzzy, c-format
-msgid "Is this OK?"
-msgstr "Ок?"
+msgid "  --X            - use X interface.\n"
+msgstr "X X"
 
-#: ../urpmi:1
+#: ../urpmi:120
+#, fuzzy, c-format
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"гаралт\n"
+" X текст горим"
+
+#: ../urpmi:122
+#, fuzzy, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"\n"
+" үгүй бол"
+
+#: ../urpmi:125
+#, c-format
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
+
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, fuzzy, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "аас"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "Нээх"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ямх с"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "ямх"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Юу ч үгүй"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "ямх"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr ""
+#: ../urpmi:130 ../urpmq:83
+#, fuzzy, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "т"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "с"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "с бол"
+
+#: ../urpmi:132
+#, fuzzy, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "аяархан горим"
+
+#: ../urpmi:134
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "Нээх"
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:197
 #, fuzzy, c-format
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Хийгдсэн"
+
+#: ../urpmi:204
+#, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr "гаралт ямх\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "с"
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "жигсаалт аас с"
+#: ../urpmi:214 ../urpmi:231
+#, c-format
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "с"
+msgid "Install it"
+msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpmf:1
+#: ../urpmi:239
+#, c-format
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+
+#: ../urpmi:240
 #, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "с"
 
-#: ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
 msgid "Copying failed"
 msgstr "Хуулалт бүтэлгүйтэв"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
-#, fuzzy, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "аас"
-
-#: ../urpmq:1
+#: ../urpmi:260
 #, fuzzy, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "жигсаалт"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "үгүй с"
+msgid "Only superuser is allowed to install packages"
+msgstr "бол"
 
-#: ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "с бол"
+#: ../urpmi:396
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "%s-ийг суулгаж байна\n"
+#: ../urpmi:403
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "Таны сонголт юу бэ? (1-%d) "
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "с"
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Package installation..."
+msgstr "Багц суулгалт..."
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Тодорхойлолт аас с."
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Урьдчилан бэлдэж байна..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "ямх"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr "г с вы?"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpmi.addmedia:1
-#, c-format
+#: ../urpmi:455
+#, fuzzy, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr "г с вы?"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, fuzzy, c-format
-msgid "package %s is not found."
-msgstr "с бол."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr "г с вы?"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, fuzzy, c-format
-msgid "removing medium \"%s\""
-msgstr "с"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "тийш МБ"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, fuzzy, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "с<relative path of hdlist>"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr "Та г с"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, fuzzy, c-format
-msgid "Cancel"
-msgstr "Хүчингүй"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, fuzzy, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "бол с"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "с с"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+msgid "Press Enter when ready..."
+msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "`%s' багцыг татан авч байна..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, fuzzy, c-format
-msgid "unable to access medium \"%s\""
-msgstr "с"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "с аас с с"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, fuzzy, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
 msgstr "с"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Та суулгалтыг үргэлжлүүлэхийг хүсэж байна уу?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Суулгалт бүтэлгүйтэв, учир нь зарим файл байхгүй байна:\n"
+"%s\n"
+"Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr ""
+
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr "Та г с"
+msgid "distributing %s"
+msgstr "хуваариалж байна %s\n"
 
-#: ../urpmq:1
+#: ../urpmi:673
 #, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
+msgid "installing %s"
+msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
+
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Хамаарлыг шалгахгүйгээр суулгахыг оролдох уу? (y/N) "
+
+#: ../urpmi:731
 #, fuzzy, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "жигсаалт аас с"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Reyna т N "
 
-#: ../urpmf:1
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "баруун бүлэг"
+msgid "%d installation transactions failed"
+msgstr "Суулгалт боломжтой"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Installation is possible"
+msgstr "Суулгалт боломжтой"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining hdlist file [%s]"
-msgstr "с"
+#: ../urpmi:783
+#, c-format
+msgid "Everything already installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "copying hdlists file..."
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "жигсаалт с"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "с жигсаалт"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"<name><url><relative_path><url> бол аас\n"
+"<path>\n"
+"<login><password><host><path><relative filename of hdlist>\n"
+"<host><path><relative filename of hdlist>\n"
+"<host><path><relative filename of hdlist>\n"
+"<path> г"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "Do nothing"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "горим"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "аас с жигсаалт бол"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "үгүй\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:62
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "Мөр"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"аас\n"
+"\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, fuzzy, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "с аас с с"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"жигсаалт аас бол\n"
+" с"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "аас"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"бол\n"
+" аас\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "жигсаалт аас с"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr "бол аас\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid ""
-"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"
-msgstr "с MandrakeSoft бол аас г"
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "аас с."
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "нэр"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "аас"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "с бол"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "аас"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "бол"
+msgid "retrieving mirrors at %s ..."
+msgstr "с."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:172
 #, fuzzy, c-format
-msgid "using specific environment on %s\n"
-msgstr "с"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "с<relative path of hdlist>"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, fuzzy, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "unable to update medium \"%s\"\n"
 msgstr "с"
 
-#: ../urpmi:1
-#, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+#: ../urpmi.addmedia:190
+#, fuzzy, c-format
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
+"с\n"
+"<relative path of hdlist>"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "зүүн бүлэг"
+msgid "`with' missing for network media\n"
+msgstr "с г"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, fuzzy, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "Цэг с"
-
-#: ../urpmf:1
-#, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
+msgid "unable to create medium \"%s\"\n"
+msgstr "с"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:34
 #, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "бүлэг бүлэг бүлэг"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr "<name><name> бол нэр"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"үл мэдэгдэх сонголтууд '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "с."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "юу ч үгүй"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmi.removemedia:50
+#, fuzzy, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr "бол г аас с"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, fuzzy, c-format
-msgid "distributing %s"
-msgstr "хуваариалж байна %s\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr "<name><name> бол нэр"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "write config file [%s]"
-msgstr "с"
-
-#: ../urpmi.update:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:63
+#, fuzzy, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "юу ч үгүй"
+
+#: ../urpmi.update:75
 #, fuzzy, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
-msgstr ""
-"\n"
-" үгүй бол"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr "бол г аас с"
 
-#: ../urpmi:1
+#: ../urpmq:38
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "с с"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr "с MandrakeSoft бол аас г"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:53
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr ""
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmq:1
+#: ../urpmq:54
 #, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "  --list-media   - list available media.\n"
 msgstr "жигсаалт жигсаалт"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:55
 #, fuzzy, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "т"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "жигсаалт жигсаалт"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, fuzzy, c-format
-msgid "Ok"
-msgstr "Ок"
+#: ../urpmq:56
+#, c-format
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, fuzzy, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "хүчингүй Тодорхойлолт с ямх"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "жигсаалт жигсаалт"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, fuzzy, c-format
-msgid "removing %s"
-msgstr "%s багцийг устгалт"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "жигсаалт жигсаалт"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
+#: ../urpmq:60
+#, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"аас\n"
-"\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "хэмжээ хэмжээ хэмжээ"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "ямх"
+#: ../urpmq:62
+#, c-format
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:65
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:75
 #, fuzzy, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr "Автоматаар аас аас с"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "urpmi database locked"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, fuzzy, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"\n"
-" үгүй бол"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "бол"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "\"%s\" файлын шинжүүдийг хүлээн авч байна..."
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "гаралт"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, fuzzy, c-format
-msgid "taking removable device as \"%s\""
-msgstr "с"
-
-#: ../urpmi:1
-#, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
+"  -i             - хэрэгтэй мэдээллийг хүн уншиж болохоор хэлбэрээр хэвлэх.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, fuzzy, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "т"
+msgid "  -g             - print groups with name also.\n"
+msgstr "нэр"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, fuzzy, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "бол"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "нэр"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to missing %s"
-msgstr ""
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "Нээх"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
+#, fuzzy, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "жигсаалт"
+
+#: ../urpmq:327
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpmi.update:1
-#, fuzzy, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr "<name><name> бол нэр"
-
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, fuzzy, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "с"
+msgid "No filelist found\n"
+msgstr "үгүй бүрэн жигсаалт"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s-ийг суулгахын тулд дараах багцуудын нэг нь шаардлагатай:"
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+#~ msgstr "с MandrakeSoft бол аас г"
+
 #, fuzzy
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Тодорхойгүй с"
@@ -2005,10 +2046,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "илүү мэдэхийг хүсвэл urpmf --help гэж бичээд үзнэ үү"
 
-#, fuzzy
-#~ msgid "no full media list was found"
-#~ msgstr "үгүй бүрэн жигсаалт"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "\"%s\"-ийн эх сурвалжийн жагсаалтыг хуулж байна..."
 
diff --git a/po/ms.po b/po/ms.po
index 70b11039..d0497b74 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2002-03-12 16:17+0800\n"
 "Last-Translator: Yuzz <yuzz@emasonline.com>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -36,823 +36,759 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "NnTt"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instal %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Instalasi pakej automatik...\n"
+"Anda telah meminta instalasi pakej %s\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to open rpmdb"
-msgstr "gagal kemaskini media \"%s\"\n"
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, c-format
+msgid "Is this OK?"
+msgstr "Semua OK?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
+msgid "Cancel"
+msgstr "Batal"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "hapus media \"%s\""
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
+#, c-format
+msgid " (Y/n) "
+msgstr " (Y/t) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: arahan tidak dijumpai\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "semua telah diinstal"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - cetak mesej bantuan ini.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -a             - pilih semua media.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:79
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:95
+#, fuzzy, c-format
+msgid "unable to handle protocol: %s"
+msgstr "gagal akses fail rpm [%s]"
+
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Pilihan Anda? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "ralat sinteks dlm fail konfigurasi pada baris %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "menemui %d header dalam kache"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
+"gagal guna media \"%s\" sbg senarai fail kerana telah digunakan oleh media "
+"lain"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr ""
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "\"%s\" telah dipakai, tidak dapat digunakan utk media tak bernama"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "ambil fail hdlist..."
+#: ../urpm.pm:209
+#, c-format
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "media \"%s\" tidak terpakai kerana senarai fail [%s] tiada"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "gagal tentukan media fail hdlist [%s] ini"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...gagal terambil: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "gagal periksa senarai fail \"%s\", media diabaikan"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "gagal mengakses fail list \"%s\", media diabaikan"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
+
+#: ../urpm.pm:257
+#, fuzzy, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Package installation..."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nama fail rpm [%s] tidak sah"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr ""
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Instalasi gagal"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "gagal cari fail daftar \"%s\", media diabaikan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"gagal mengakses media instalasi pertama (fail Mandrake/base/hdlists tidak "
-"dijumpai)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "ketidaksinambungan senarai fail \"%s\", media diabaikan"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Salah pilih, cuba lagi\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "gagal periksa senarai fail \"%s\", media diabaikan"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "terlalu banyak titik sambung utk media removable \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr ""
+msgid "taking removable device as \"%s\""
+msgstr "ambil peranti removable sbg \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Pakej berikut mengandungi %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalasi gagal"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "pakai removable peranti lain [%s] untuk \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - guna antaramuka X.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Salah satu pakej berikut diperlukan:"
+msgid "unable to write config file [%s]"
+msgstr "gagal tulis fail konfigurasi [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
+msgid "write config file [%s]"
+msgstr "tulis fail konfigurasi [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - pilih antaramuka terbaik menurut persekitaran:\n"
-"                   X atau mode teks.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "Install pakej `%s' (%s/%s)..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpmi:1
-#, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
+#: ../urpm.pm:423
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "tiada pakej bernama %s"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+#: ../urpm.pm:441
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"penggunan: urpmi.removemedia [-a] <nama> ...\n"
-"<nama> adalah nama media yg akan dihapus.\n"
+msgid "examining synthesis file [%s]"
+msgstr "periksa file sintesis [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
+msgid "examining hdlist file [%s]"
+msgstr "periksa baca fail hdlist [%s]"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "`with' missing for network media\n"
-msgstr ""
+#: ../urpm.pm:517 ../urpm.pm:902
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid "Installation is possible"
-msgstr "Instalasi gagal"
+msgid "skipping package %s"
+msgstr "tiada pakej bernama %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "media \"%s\" tidak terpakai kerana senarai fail [%s] tiada"
+msgid "unable to open rpmdb"
+msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/T) "
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" telah ada"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mod verbos.\n"
+msgid "added medium %s"
+msgstr "media %s ditambahkan"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Persediaan..."
+msgid "unable to access first installation medium"
+msgstr "gagal mengakses media instalasi pertama"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "sedang menyalin fail hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+msgid "...copying failed"
+msgstr "...salin selesai"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
+msgid "...copying done"
+msgstr "...salin selesai"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"gagal mengakses media instalasi pertama (fail Mandrake/base/hdlists tidak "
+"dijumpai)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "retrieving hdlists file..."
+msgstr "ambil fail hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr ""
+msgid "...retrieving done"
+msgstr "...capaian selesai"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"pilihan tidak diketahui '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...gagal terambil: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskripsi hdlist yang tidak sah \"%s\" dalam fail hdlist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
+msgid "selecting multiple media: %s"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bangun hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "fail deskripsi \"%s\" sedang disalin"
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, fuzzy, c-format
 msgid "examining MD5SUM file"
 msgstr "periksa baca fail hdlist [%s]"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: arahan tidak dijumpai\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
+#, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
+
+#: ../urpm.pm:1109
 #, fuzzy, c-format
-msgid "unable to register rpm file"
-msgstr "gagal akses fail rpm [%s]"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, fuzzy, c-format
-msgid "unable to handle protocol: %s"
-msgstr "gagal akses fail rpm [%s]"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "ambil fail hdlist..."
+#: ../urpm.pm:1174
+#, fuzzy, c-format
+msgid "reading rpm files from [%s]"
+msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1199
+#, fuzzy, c-format
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "added medium %s"
-msgstr "media %s ditambahkan"
+msgid "no rpm files found from [%s]"
+msgstr "tiada fail rpm dijumpai dari [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
 
-#: ../urpm.pm:1
-#, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "gagal mengambil hdlist (atau sintesis) source"
+
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "ralat sinteks dlm fail konfigurasi pada baris %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "gagal mengambil hdlist (atau sintesis) source"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
+#: ../urpm.pm:1490
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "gagal mengolah fail hdlist \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s kemasukan di depslist direlokasikan"
+msgid "unable to write list file of \"%s\""
+msgstr "gagal baca senarai fail \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "nothing written in list file for \"%s\""
+msgstr "tiada yg ditulis dalam fail daftar \"%s\""
+
+#: ../urpm.pm:1603
+#, fuzzy, c-format
+msgid "examining pubkey file of \"%s\"..."
+msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "ambil fail hdlist..."
+msgid "unable to import pubkey file of \"%s\""
+msgstr "gagal baca senarai fail \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1679
 #, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+msgid "reading headers from medium \"%s\""
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr ""
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+msgid "building hdlist [%s]"
+msgstr "bangun hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" telah ada"
+msgid "found %d headers in cache"
+msgstr "menemui %d header dalam kache"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "instal %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "hapus %d header usang dlm kache"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"masukan kemaskini hilang\n"
-"(satu dari %s)\n"
+msgid "mounting %s"
+msgstr "mounting %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr ""
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to remove package %s"
-msgstr "tidak dapat mengambil pakej asal, batal"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
+msgid "unmounting %s"
+msgstr "unmount %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"masukan utk penghapusan hilang\n"
-"(satu dari %s)\n"
+msgid "relocated %s entries in depslist"
+msgstr "%s kemasukan di depslist direlokasikan"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - pilih semua media.\n"
+msgid "no entries relocated in depslist"
+msgstr "tiada masukan direlokasikan dlm depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "invalid rpm file name [%s]"
+msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, fuzzy, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
-
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "ambil fail hdlist..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "gagal akses fail rpm [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
-#: ../_irpm:1 ../urpmi:1
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/t) "
+msgid "unable to register rpm file"
+msgstr "gagal akses fail rpm [%s]"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr ""
+msgid "error registering local packages"
+msgstr "ralat pendaftaran pakej setempat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+msgid "no package named %s"
+msgstr "tiada pakej bernama %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input cacat: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
 
-#: ../urpmq:1
-#, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr ""
+#: ../urpm.pm:2335
+#, fuzzy, c-format
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Install pakej `%s' (%s/%s)..."
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "tiada masukan direlokasikan dlm depslist"
+msgid "package %s is not found."
+msgstr "pakej %s tidak dijumpai."
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+msgid "urpmi database locked"
+msgstr "database urpmi terkunci"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "ketidaksinambungan senarai fail \"%s\", media diabaikan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...capaian selesai"
+msgid "unable to access medium \"%s\""
+msgstr "gagal akses media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "input cacat: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "tiada pakej bernama %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "gagal baca fail rpm [%s] dari media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versi %s\n"
-"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
-"GNU.\n"
-"\n"
-"penggunaan:\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, fuzzy, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
+msgid "unable to create transaction"
+msgstr "gagal membuat media \"%s\"\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "gagal tentukan media fail hdlist [%s] ini"
+#: ../urpm.pm:2794
+#, fuzzy, c-format
+msgid "removing package %s"
+msgstr "hapus media \"%s\""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "gagal mengolah fail hdlist \"%s\""
+#: ../urpm.pm:2796
+#, fuzzy, c-format
+msgid "unable to remove package %s"
+msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
+#: ../urpm.pm:2809
+#, fuzzy, c-format
+msgid "unable to install package %s"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "hapus %d header usang dlm kache"
+#: ../urpm.pm:3009 ../urpm.pm:3042
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "curl hilang\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "gagal kemaskini media \"%s\"\n"
+msgid "due to unsatisfied %s"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "media \"%s\" tidak dipilih"
+msgid "trying to promote %s"
+msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -a             - pilih semua media.\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "pakai removable peranti lain [%s] untuk \"%s\""
+msgid "in order to install %s"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3094
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
-
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "\"%s\" telah dipakai, tidak dapat digunakan utk media tak bernama"
+msgid "bad proxy declaration on command line\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Salah pilih, cuba lagi\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
@@ -869,618 +805,646 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"penggunaan: urpmi.addmedia [pilihan] <nama> <url> [with <path_relatif>]\n"
-"keterangan: <url> adalah\n"
-"       file://<path>\n"
-"       ftp://<login>:<sandi>@<host>/<path> with <namafail relatif hdlist>\n"
-"       ftp://<host>/<path> with <namafail relatif hdlist>\n"
-"       http://<host>/<path> with <namafail relatif hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"dan [pilihan] dari\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...salin selesai"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, fuzzy, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "gagal kemaskini media \"%s\"\n"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "gagal mengakses media instalasi pertama"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mod verbos.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "tiada pakej bernama %s"
+
+#: ../urpme:83
 #, c-format
-msgid "virtual medium need to be local"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "error registering local packages"
-msgstr "ralat pendaftaran pakej setempat"
+msgid "removing package %s will break your system"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:95
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "gagal mengambil hdlist (atau sintesis) source"
+msgid "Checking to remove the following packages"
+msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "tiada fail rpm dijumpai dari [%s]"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "tiada yg ditulis dalam fail daftar \"%s\""
+msgid " (y/N) "
+msgstr " (y/T) "
 
-#: ../urpmi:1
+#: ../urpme:111 ../urpmi:675
 #, fuzzy, c-format
-msgid "The following packages have bad signatures"
-msgstr "Pakej berikut mengandungi %s: %s"
+msgid "removing %s"
+msgstr "mounting %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "sedang menyalin sumber/sintesis hdlist \"%s\"..."
+msgid "Removing failed"
+msgstr "...gagal terambil: %s"
 
-#: ../urpmq:1
+#: ../urpmf:27
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, fuzzy, c-format
-msgid "unable to install package %s"
-msgstr "Hanya superuser yang boleh menginstal pakej"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "Save file"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "gagal tulis fail konfigurasi [%s]"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:38
 #, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - mod verbos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
+#: ../urpmf:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
+
+#: ../urpmf:42
+#, fuzzy, c-format
+msgid "  --all          - print all tags.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
+
+#: ../urpmf:43
+#, fuzzy, c-format
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
+
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
+
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<path relatif hdlist> hilang\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:51
 #, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "Salah satu pakej berikut diperlukan:"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "gagal akses fail rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, fuzzy, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "gagal akses fail rpm [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-
-#: ../urpmq:1
+#: ../urpmf:59
 #, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -f             - paksa buat fail hdlist.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, fuzzy, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "unmounting %s"
-msgstr "unmount %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:114
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
-"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "periksa file sintesis [%s]"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versi %s\n"
+"Hakcipta (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini perisian percuma dan boleh disebar mengikut kesesuaian lesen publik "
+"GNU.\n"
+"\n"
+"penggunaan:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "...salin selesai"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mod diam.\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - mod verbos.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - keluarkan header senarai pakej  dari dalam db urpmi ke\n"
-"                   stdout (hanya root).\n"
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "tiada pakej bernama %s"
-
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr ""
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:94
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "tiada penghapusan (guna urpmi.addmedia utk tambah media)\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
+
+#: ../urpmi:96
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "gagal cari fail daftar \"%s\", media diabaikan"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:98
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - cetak mesej bantuan ini.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmf:1
-#, 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"
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\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:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
+#, c-format
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:119
 #, c-format
-msgid "Is this OK?"
-msgstr "Semua OK?"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - guna antaramuka X.\n"
 
-#: ../urpmi:1
+#: ../urpmi:120
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - pilih antaramuka terbaik menurut persekitaran:\n"
+"                   X atau mode teks.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:122
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "periksa baca fail hdlist [%s]"
-
-#: ../urpme:1
+#: ../urpmi:125
 #, c-format
-msgid "Nothing to remove"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "hapus media \"%s\""
-
-#: ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../urpmf:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr ""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "gagal baca senarai fail \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmf:1
+#: ../urpmi:132
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr ""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mod diam.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 
-#: ../urpmf:1
+#: ../urpmi:141
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "Salin selesai"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:197
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - paksa buat fail hdlist.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+msgid "Do nothing"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:213
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Yes, really install it"
 msgstr ""
-"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "installing %s"
-msgstr "instal %s\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "reading rpm files from [%s]"
-msgstr "tiada fail rpm dijumpai dari [%s]"
-
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "fail deskripsi \"%s\" sedang disalin"
+msgid "Save file"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
+#: ../urpmi:225
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "...gagal terambil: %s"
+msgid "Install it"
+msgstr "Instalasi gagal"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "pakej %s tidak dijumpai."
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "hapus media \"%s\""
+#: ../urpmi:243 ../urpmi:365
+#, fuzzy, c-format
+msgid "Copying failed"
+msgstr "Salin selesai"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "tak perlu memberikan <path relatif hdlist> dgn --distrib"
+msgid "Only superuser is allowed to install packages"
+msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Batal"
+msgid "One of the following packages is needed:"
+msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+msgid "What is your choice? (1-%d) "
+msgstr "Pilihan Anda? (1-%d) "
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
+#, c-format
+msgid "Initializing..."
+msgstr "Persediaan..."
+
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "gagal akses media \"%s\""
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "gagal membuat media \"%s\"\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1489,357 +1453,401 @@ msgstr ""
 "Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "gagal mengakses fail list \"%s\", media diabaikan"
+msgid "unable to get source packages, aborting"
+msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../urpmf:1
+#: ../urpmi:540
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Masukkan media \"%s\" ke peranti [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "examining hdlist file [%s]"
-msgstr "periksa baca fail hdlist [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "copying hdlists file..."
-msgstr "sedang menyalin fail hdlist..."
-
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, fuzzy, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "fail hdlist utk media \"%s\" tak dijumpai"
+msgid "Downloading package `%s'..."
+msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "Do nothing"
-msgstr ""
+#: ../urpmi:619
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "mounting %s"
-msgstr "mounting %s"
-
-#: ../urpm.pm:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"gagal guna media \"%s\" sbg senarai fail kerana telah digunakan oleh media "
-"lain"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "tidak dapat mengambil pakej asal, batal"
+msgid "Installation failed"
+msgstr "Instalasi gagal"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
+msgid "distributing %s"
+msgstr "instal %s\n"
+
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "instal %s\n"
 
-#: ../urpmi:1
+#: ../urpmi:688
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
+
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
+
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "gagal mengambil hdlist (atau sintesis) source"
+msgid "%d installation transactions failed"
+msgstr "Instalasi gagal"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "gagal baca senarai fail \"%s\""
+msgid "Installation is possible"
+msgstr "Instalasi gagal"
 
-#: ../urpmi:1
+#: ../urpmi:783
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr ""
+msgid "Everything already installed"
+msgstr "semua telah diinstal"
 
-#: ../urpmq:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"penggunaan: urpmi.addmedia [pilihan] <nama> <url> [with <path_relatif>]\n"
+"keterangan: <url> adalah\n"
+"       file://<path>\n"
+"       ftp://<login>:<sandi>@<host>/<path> with <namafail relatif hdlist>\n"
+"       ftp://<host>/<path> with <namafail relatif hdlist>\n"
+"       http://<host>/<path> with <namafail relatif hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"penggunaan:\n"
+"dan [pilihan] dari\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - buat media update.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "media \"%s\" tidak dipilih"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Hanya superuser yang boleh menginstal pakej"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "gagal temui fail hdlist \"%s\", media diabaikan"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
-
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "terlalu banyak titik sambung utk media removable \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+#: ../urpmi.addmedia:72
+#, c-format
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
+#: ../urpmi.addmedia:74 ../urpmi.update:39
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
-msgstr "gagal membuat media \"%s\"\n"
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "gagal baca fail rpm [%s] dari media \"%s\""
+#: ../urpmi.addmedia:76 ../urpmi.update:43
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - paksa buat fail hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "distributing %s"
-msgstr "instal %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "ambil fail hdlist..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "tak perlu memberikan <path relatif hdlist> dgn --distrib"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "write config file [%s]"
-msgstr "tulis fail konfigurasi [%s]"
+msgid "unable to update medium \"%s\"\n"
+msgstr "gagal kemaskini media \"%s\"\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - pilih semua media non-removable.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+#: ../urpmi.addmedia:192
+#, c-format
+msgid "`with' missing for network media\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "gagal membuat media \"%s\"\n"
+
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"penggunan: urpmi.removemedia [-a] <nama> ...\n"
+"<nama> adalah nama media yg akan dihapus.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Masukkan media \"%s\" ke peranti [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - pilih semua media.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"pilihan tidak diketahui '%s'\n"
 
-#: ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "tiada penghapusan (guna urpmi.addmedia utk tambah media)\n"
+
+#: ../urpmi.removemedia:50
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"masukan utk penghapusan hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:28
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"penggunaan: urpmi.update [pilihan] <nama> ...\n"
+"<nama> adalah media yg akan dikemaskini.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.update:38
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
+
+#: ../urpmi.update:40
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:41
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskripsi hdlist yang tidak sah \"%s\" dalam fail hdlist"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - pilih semua media non-removable.\n"
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "mounting %s"
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"masukan kemaskini hilang\n"
+"(satu dari %s)\n"
 
-#: ../urpmf:1
+#: ../urpmq:38
 #, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --help         - cetak mesej bantuan ini.\n"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
+#, fuzzy, c-format
+msgid "  --list         - list available packages.\n"
+msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
+
+#: ../urpmq:54
 #, c-format
-msgid "in order to keep %s"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:56
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"Instalasi pakej automatik...\n"
-"Anda telah meminta instalasi pakej %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "urpmi database locked"
-msgstr "database urpmi terkunci"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "fail deskripsi \"%s\" sedang disalin"
-
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:60
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - keluarkan header senarai pakej  dari dalam db urpmi ke\n"
+"                   stdout (hanya root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "ambil peranti removable sbg \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --help         - cetak mesej bantuan ini.\n"
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - lakukan pencarian fuzzy (sama dengan -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, fuzzy, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1847,41 +1855,79 @@ msgid ""
 msgstr ""
 "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
+#: ../urpmq:80
+#, fuzzy, c-format
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -d             - tambah pencarian ke kebergantungan pakej.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "curl hilang\n"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -f             - paksa buat fail hdlist.\n"
+
+#: ../urpmq:86
+#, fuzzy, c-format
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
+
+#: ../urpmq:90
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
-"penggunaan: urpmi.update [pilihan] <nama> ...\n"
-"<nama> adalah media yg akan dikemaskini.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "cuba lepaslalu media sedia ada\"%s\", abaikan"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:388
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No filelist found\n"
+msgstr ""
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
 msgstr ""
 
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
+
 #~ msgid "wget is missing\n"
 #~ msgstr "wget hilang\n"
 
diff --git a/po/mt.po b/po/mt.po
index 447ebfee..12949ad4 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-09-13 06:18+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -38,860 +38,771 @@ msgstr "IiYy"
 msgid "Nn"
 msgstr "LlNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "qed jiġi nstallat %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
+"Installazzjoni awtomatika ta' pakketti...\n"
+"Int tlabt l-installazzjoni tal-pakkett %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "ma nistax niftaħ rpmdb"
+msgid "Is this OK?"
+msgstr "Tajjeb?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Ikkanċella"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "ed jitneħħa l-pakkett %s"
+msgid " (Y/n) "
+msgstr " (I/l) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: kmand ma nstabx\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "kollox diġà installat"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - uri l-grupp.\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protokoll mhux magħruf definit għal %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "qed jintuża l-proċess %d biex jagħmel tranżazzjoni"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
+msgid "unable to handle protocol: %s"
+msgstr "ma nistax nuża l-protokoll: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "X'tagħżel? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "żball sintattiku fil-fajl ta' konfigurazzjoni, fuq linja %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "instabu %d headers fil-cache"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - speċifika user u password biex tuża għall-"
-"awtentikazzjoni\n"
-"                   tal-proxy (format huwa <user:password>).\n"
+"ma nistax nieħu ħsieb is-sors \"%s\" peress li l-fajl tal-lista diġà qed "
+"jintuża minn sors ieħor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ma nistax nuża l-isem \"%s\" għas-sors għax diġà qed jintuża"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "qed jinġab il-fajl rpm [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"ma nistax nuża s-sors \"%s\" peress li ma jeżistix fajl ta' lista \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - elenka l-aliases paralleli disponibbli.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ma nistax niddetermina s-sors ta' dan il-fajl hdlist [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...qari falla: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ma nistax jispezzjona l-fajl tal-lista għal \"%s\", sors injorat"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operatur OR binarju: veru jekk espressjoni minnhom veru.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Installazzjoni ta' pakketti..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"sors virtwali \"%s\" ma jistax ikollu hdlist jew fajl ta' lista definit; "
+"sors injorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "isem tal-fajl rpm [%s] invalidu"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "is-sors virtwali \"%s\" għandu jkollu url ċar; sors injurat"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ma nistax insib il-fajl hdlist għal \"%s\", sors injorat"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
-"Mandrake/base/hdlists)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fajl tal-lista ta' \"%s\" ma jinftehimx, sors injorat"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ma nistax jispezzjona l-fajl tal-lista għal \"%s\", sors injorat"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - uri sommarju.\n"
+msgid "taking removable device as \"%s\""
+msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Dawn il-pakketti fihom %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "installazzjoni falliet"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "qed jintuża apparat [%s] għal \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - uża l-interfaċċja X.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
+msgid "unable to write config file [%s]"
+msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
+msgid "write config file [%s]"
+msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - agħżel l-aħjar interfaċċja skond l-ambjent, X jew "
-"testwali.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Qed jitniżżel il-pakkett \"%s\"..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "X'jista' jsir minn fajls rpm binarji meta tuża --install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "qed jiġi eżaminat \"parallel handler\" fil-fajl [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "instab \"parallel handler\" għal nodi: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "ebda pakkett imsejjaħ %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "qed tintuża medja assoċjata għal modalità parallela: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "ma nistax nuża għażla parallela \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"L-installazzjoni falliet, xi fajls huma nieqsa:\n"
-"\n"
-"%s\n"
-"Forsi trid taġġorna d-database urpmi"
+"--synthesis ma jistax jintuża ma' --media, --excludemedia, --sortmedia,  --"
+"update jew --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"użu: urpmi.removemedia [-a] <isem> ...\n"
-"fejn <isem> huwa l-isem tas-sors xi tneħħi.\n"
+msgid "examining synthesis file [%s]"
+msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"L-installazzjoni ma tistax tkompli għax dawn il-pakketti jridu \n"
-"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "\"with\" nieqes għal sors tan-network\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "sors virtwali \"%s\" mhux lokali; sors injorat"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pakkett mhux magħruf"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problema fil-qari tal-hdlist jew sinteżi għas-sors \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Installazzjoni possibbli"
+msgid "performing second pass to compute dependencies\n"
+msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "qed jinqabeż pakkett %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
-"d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "jaġġorna minflok jinstalla pakkett %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"ma nistax nuża s-sors \"%s\" peress li ma jeżistix fajl ta' lista \"%s\""
+msgid "unable to open rpmdb"
+msgstr "ma nistax niftaħ rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (i/L) "
+msgid "medium \"%s\" already exists"
+msgstr "sors \"%s\" diġà jeżisti"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ma jistgħux jiġu miżjuda aġġornamenti ta' distribuzzjoni \"cooker\"\n"
+msgid "virtual medium need to be local"
+msgstr "sors virtwali jrid ikun lokali"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
+msgid "added medium %s"
+msgstr "ġie miżjud is-sors %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Qed jibda..."
+msgid "unable to access first installation medium"
+msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+msgid "copying hdlists file..."
+msgstr "qed nikkopja l-fajl hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - uri t-tags kollha.\n"
+msgid "...copying failed"
+msgstr "...ikkupjar falla"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
+msgid "...copying done"
+msgstr "...ikkupjar lest"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"sors virtwali \"%s\" ma jistax ikollu hdlist jew fajl ta' lista definit; "
-"sors injorat"
+"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "qed nikkalkula md5sum tal-hdlist jew sinteżi kkupjat"
+msgid "retrieving hdlists file..."
+msgstr "qed naqra l-fajl \"hdlists\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - eskludi direttorji separati b'virgoli.\n"
+msgid "...retrieving done"
+msgstr "...qari lest"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Agħfas Enter meta tlesti..."
+msgid "...retrieving failed: %s"
+msgstr "...qari falla: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"għażla \"%s\" mhux magħrufa\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "deskrizzjoni tal-hdlist \"%s\" invalida fil-fajl hdlist"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problema fil-qari tal-hdlist jew sinteżi għas-sors \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "qed nagħżel sors multiplu: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - uża wget biex iġġib fajls remoti.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "qed jitneħħa s-sors \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
+"ma nistax naċċessa s-sors \"%s\",\n"
+"dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
+"is-sors."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - illistja nodi disponibbli għal --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"sors virtwali \"%s\" għandu jkollu hdlist jew sinteżi validu, sors injorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "qed jinbena hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  --keep         - żomm il-pakketti eżistenti jekk jista' jkun, iċħadkeep "
-"existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"qed tiġi kalkulata l-md5sum ta l-hdlist (jew sinteżi) tas-sors eżistenti"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "qed jiġi eżaminat il-fajl MD5SUM"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: kmand ma nstabx\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "unable to register rpm file"
-msgstr "ma nistax nirreġistra l-fajl rpm"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
-"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ma nistax nuża l-protokoll: %s"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "qed nikkalkula md5sum tal-hdlist jew sinteżi kkupjat"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "qed naqra l-fajl \"hdlists\"..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "ikkupjar ta' [%s] falla"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "ġie miżjud is-sors %s"
+msgid "reading rpm files from [%s]"
+msgstr "qed jinqraw fajls rpm minn [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "qed tinħoloq tranżazzjoni għal %s (neħħi=%d, installa=%d, aġġorna=%d)"
+msgid "no rpm files found from [%s]"
+msgstr "ebda fajls rpm ma nstabu minn [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum ma qablitx"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "żball sintattiku fil-fajl ta' konfigurazzjoni, fuq linja %s"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand se jiġu nstallati.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - uża l-proxy HTTP speċifikat. In-numru tal-port huwa "
-"meqjus\n"
-"                   li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
-">).\n"
+msgid "md5sum mismatch"
+msgstr "md5sum ma qablitx"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "in order to install %s"
-msgstr "sabiex ninstalla %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "il-qari tal-hdlist jew sinteżi sors falla."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s elementi relokati f' depslist"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fajl [%s] diġà użat fl-istess medjum \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "jaġġorna minflok jinstalla pakkett %s"
+msgid "unable to write list file of \"%s\""
+msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "qed jinġabu mirja minn %s ..."
+msgid "writing list file for medium \"%s\""
+msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - uri l-url.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "ma nkiteb xejn fil-lista għal \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokoll mhux magħruf definit għal %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "sors \"%s\" diġà jeżisti"
+msgid "reading headers from medium \"%s\""
+msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "qed jiġi nstallat %s\n"
+msgid "building hdlist [%s]"
+msgstr "qed jinbena hdlist [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"l-element li trid taġġorna m'hux hemm\n"
-"(wieħed minn %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr "qed nipprova nippromwovi %s"
+msgid "found %d headers in cache"
+msgstr "instabu %d headers fil-cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ma nistax inneħħi l-pakkett %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "qed inneħħi %d headers antiki mill-cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
+msgid "mounting %s"
+msgstr "qed jiġi mmuntat %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"l-element li trid tneħħi m'hux hemm\n"
-"(wieħed minn %s)\n"
+msgid "unmounting %s"
+msgstr "qed niżmonta %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - agħżel is-sorsi kollha.\n"
+msgid "relocated %s entries in depslist"
+msgstr "%s elementi relokati f' depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Firma nieqsa (%s)"
+msgid "no entries relocated in depslist"
+msgstr "ebda element relokat f' deplist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "isem tal-fajl rpm [%s] invalidu"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "qed jinġab il-fajl rpm [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "ma nistax naċċessa l-fajl rpm [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+msgid "unable to register rpm file"
+msgstr "ma nistax nirreġistra l-fajl rpm"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (I/l) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - uri l-grupp.\n"
+msgid "error registering local packages"
+msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
+msgid "no package named %s"
+msgstr "ebda pakkett imsejjaħ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input iffurmat ħażin [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Dawn il-pakketti fihom %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
+"sors \"%s\" juża lista ta' fajls invalida:\n"
+"  mera aktarx mhux aġġornata; se nipprova mod ieħor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ebda element relokat f' deplist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "sors \"%s\" ma jiddefinixxi ebda lokazzjoni tal-fajls rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - installa biss pakketti bis-sorsi (mingħajr binarji).\n"
+msgid "package %s is not found."
+msgstr "pakkett %s ma nstabx."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
+msgid "urpmi database locked"
+msgstr "database urpmi imsakkar"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "sors \"%s\" mhuwiex magħżul"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "taqbel?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fajl tal-lista ta' \"%s\" ma jinftehimx, sors injorat"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...qari lest"
+msgid "unable to access medium \"%s\""
+msgstr "ma nistax naċċessa s-sors \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "qed jiġi miżlud pakkett \"%s\" (id=%d eid=%d, aġġorna=%d, fajl=%s)"
+msgid "malformed input: [%s]"
+msgstr "input iffurmat ħażin [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "qed jinqabeż pakkett %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma invalida (%s)"
+msgid "Preparing..."
+msgstr "Qed nipprepara..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
-"spezzjonati.\n"
+msgid "using process %d for executing transaction"
+msgstr "qed jintuża l-proċess %d biex jagħmel tranżazzjoni"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verżjoni %s\n"
-"Copyright (C) 1999, 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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "qed tinħoloq tranżazzjoni għal %s (neħħi=%d, installa=%d, aġġorna=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ma nistax niddetermina s-sors ta' dan il-fajl hdlist [%s]"
+msgid "unable to create transaction"
+msgstr "ma nistax noħloq tranżazzjoni"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
+msgid "removing package %s"
+msgstr "ed jitneħħa l-pakkett %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
+msgid "unable to remove package %s"
+msgstr "ma nistax inneħħi l-pakkett %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "minħabba konflitt ma' %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "qed jiġi miżlud pakkett \"%s\" (id=%d eid=%d, aġġorna=%d, fajl=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "qed inneħħi %d headers antiki mill-cache"
+msgid "unable to install package %s"
+msgstr "ma nistax ninstalla l-pakkett %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ma nistax naġġorna s-sors \"%s\"\n"
+msgid "due to missing %s"
+msgstr "minħabba %s nieqes"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
+msgid "due to unsatisfied %s"
+msgstr "minħabba %s mhux sodisfatt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "sors virtwali \"%s\" mhux lokali; sors injorat"
+msgid "trying to promote %s"
+msgstr "qed nipprova nippromwovi %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Qed nipprepara..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+msgid "in order to keep %s"
+msgstr "sabiex inżomm %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "qed jintuża apparat [%s] għal \"%s\""
+msgid "in order to install %s"
+msgstr "sabiex ninstalla %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - tippruvax tfittex fajls sinteżi jew hdlist.\n"
+msgid "due to conflicts with %s"
+msgstr "minħabba konflitt ma' %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - tfittixx fil-\"provides\" biex issib pakkett.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "ikkupjar ta' [%s] falla"
+msgid "unrequested"
+msgstr "mhux mitlub"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Firma invalida (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "ID taċ-ċifrarju invalidu (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
+msgid "Missing signature (%s)"
+msgstr "Firma nieqsa (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "ma nistax nuża l-isem \"%s\" għas-sors għax diġà qed jintuża"
+msgid "bad proxy declaration on command line\n"
+msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"sors virtwali \"%s\" għandu jkollu hdlist jew sinteżi validu, sors injorat"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -908,641 +819,693 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"użu: urpmi.addmedia [għażliet] <isem><url> [with <direttorju_relattiv>]\n"
-"fejn <url> huwa wieħed minn:\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <isem tal-hdlist "
-"relattiv>\n"
-"       ftp://<host>/<path> with <isem tal-hdlist relattiv>\n"
-"       http://<host>/<path> with <isem tal-hdlist relattiv>\n"
-"       removable://<path>\n"
-"\n"
-"u [għażliet] huma minn\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "qed nikkopja l-hdlist (jew sinteżi) sors ta' \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...ikkupjar lest"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ma nistax nuża għażla parallela \"%s\""
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
+
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
+
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"sors \"%s\" juża lista ta' fajls invalida:\n"
-"  mera aktarx mhux aġġornata; se nipprova mod ieħor"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "sors virtwali jrid ikun lokali"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
+msgid "unknown packages"
+msgstr "pakketti mhux magħrufa"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - illimita r-rata ta' tniżżil.\n"
+msgid "unknown package"
+msgstr "pakkett mhux magħruf"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
+msgid "removing package %s will break your system"
+msgstr "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "il-qari tal-hdlist jew sinteżi sors falla."
+msgid "Nothing to remove"
+msgstr "M'hemm xejn x'inneħħi"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ebda fajls rpm ma nstabu minn [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Qed niċċekkja biex jitneħħa wieħed minn dawn il-pakketti"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ma nkiteb xejn fil-lista għal \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Dawn il-pakketti fihom firem ħżiena"
+msgid " (y/N) "
+msgstr " (i/L) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr ""
-"qed tiġi kalkulata l-md5sum ta l-hdlist (jew sinteżi) tas-sors eżistenti"
+msgid "removing %s"
+msgstr "qed jitneħħa %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "Removing failed"
+msgstr "Tneħħija falliet"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf verżjoni %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "ma nistax ninstalla l-pakkett %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - eskludi s-sorsi msemmija, separati b'virgoli.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - jippermetti li l-user jiġi mistoqsi jridx jinstalla \n"
-"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
-"                   u integrità.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+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:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
+
+#: ../urpmf:39
+#, c-format
+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 tat-tag (impliċitu jekk il-kmand ma fihx "
+"tag,\n"
+"                   inkompatibbli mal-modalità interattiva).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - uri t-tags kollha.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - uri l-grupp.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID taċ-ċifrarju invalidu (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - uri d-daqs.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
-"  --force        - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - uri sommarju.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - uri deskrizzjoni\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<isem tal-hdlist relattiv> mhux speċifikat\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Qed niċċekkja biex jitneħħa wieħed minn dawn il-pakketti"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - uri l-url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "mhux mitlub"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ma nistax naċċessa l-fajl rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - uri \"files\": il-files kollha\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Trid tkompli l-installazzjoni ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ma nistax naqra l-rpm [%s] mis-sors \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - uri informazzjoni utli f'forma li tinftiehem faċilment.\n"
+"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - operatur OR binarju: veru jekk espressjoni minnhom veru.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "unmounting %s"
-msgstr "qed niżmonta %s"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% lest, rata = %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
+"callback huwa :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
+msgid "using specific environment on %s\n"
+msgstr "qed jintuża ambjent speċifiku fuq %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "...copying failed"
-msgstr "...ikkupjar falla"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verżjoni %s\n"
+"Copyright (C) 1999, 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"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modalità kwieta.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
 
-#: ../urpmf:1
+#: ../urpmi:85
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
-"biss).\n"
+"  --keep         - żomm il-pakketti eżistenti jekk jista' jkun, iċħadkeep "
+"existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - oħroġ il-headers għall-pakkett imsemmi mid-db urpmi\n"
-"                   għal stdout (root biss).\n"
 
-#: ../urpme:1
+#: ../urpmi:91
 #, c-format
-msgid "unknown packages"
-msgstr "pakketti mhux magħrufa"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "qed nagħżel sors multiplu: %s"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
+"  --src          - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
+"s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fajl [%s] diġà użat fl-istess medjum \"%s\""
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - installa biss pakketti bis-sorsi (mingħajr binarji).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:95
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "xejn x'inneħħi (uża urpmi.addmedia biex iżżid sors)\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:98
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - uri dan il-messaġġ ta' għajnuna.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - ippermetti li l-user jiġi mistoqsi jekk iridx jinstalla\n"
+"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "instab \"parallel handler\" għal nodi: %s"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - jippermetti li l-user jiġi mistoqsi jridx jinstalla \n"
+"                   pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
+"                   u integrità.\n"
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"callback huwa :\n"
-"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr ""
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uża wget biex iġġib fajls remoti.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, 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 verżjoni %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - illimita r-rata ta' tniżżil.\n"
+
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --quiet         - turix l-isem tat-tag (impliċitu jekk il-kmand ma fihx "
-"tag,\n"
-"                   inkompatibbli mal-modalità interattiva).\n"
+"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
+"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpmf:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
+"  --proxy        - uża l-proxy HTTP speċifikat. In-numru tal-port huwa "
+"meqjus\n"
+"                   li huwa 1080 impliċitament (format huwa <proxyhost[:port]"
+">).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"--synthesis ma jistax jintuża ma' --media, --excludemedia, --sortmedia,  --"
-"update jew --parallel"
+"  --proxy-user   - speċifika user u password biex tuża għall-"
+"awtentikazzjoni\n"
+"                   tal-proxy (format huwa <user:password>).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
+"  --bug          - ipproduċi rapport ta' bug fid-direttorju indikat "
+"fl-                   argument li jmiss.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:119
 #, c-format
-msgid "Is this OK?"
-msgstr "Tajjeb?"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - uża l-interfaċċja X.\n"
 
-#: ../urpmi:1
+#: ../urpmi:120
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  --best-output  - agħżel l-aħjar interfaċċja skond l-ambjent, X jew "
+"testwali.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:122
 #, c-format
-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"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
+"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "qed jiġi eżaminat \"parallel handler\" fil-fajl [%s]"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - eskludi direttorji separati b'virgoli.\n"
 
-#: ../urpme:1
+#: ../urpmi:126
 #, c-format
-msgid "Nothing to remove"
-msgstr "M'hemm xejn x'inneħħi"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - ippermetti tfittix fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - tfittixx fil-\"provides\" biex issib pakkett.\n"
 
-#: ../urpmi:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --bug          - ipproduċi rapport ta' bug fid-direttorju indikat "
-"fl-                   argument li jmiss.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "sors \"%s\" ma jiddefinixxi ebda lokazzjoni tal-fajls rpm"
+"  -y             - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ma nistax nikteb il-fajl tal-lista \"%s\""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modalità kwieta.\n"
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  ismijiet jew fajls rpm mogħtija fuq il-linja ta' kmand se jiġu nstallati.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - uri deskrizzjoni\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "X'jista' jsir minn fajls rpm binarji meta tuża --install-src"
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
-msgid "Copying failed"
-msgstr "Ikkupjar falla"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:212
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
+msgid "Do nothing"
+msgstr "Tagħmel xejn"
 
-#: ../urpmq:1
+#: ../urpmi:213
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Save file"
 msgstr ""
-"  -s             - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "installing %s"
-msgstr "qed jiġi nstallat %s"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "reading rpm files from [%s]"
-msgstr "qed jinqraw fajls rpm minn [%s]"
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "installazzjoni falliet"
 
-#: ../urpm.pm:1
+#: ../urpmi:239
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:240
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
 
-#: ../urpme:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "Removing failed"
-msgstr "Tneħħija falliet"
+msgid "Copying failed"
+msgstr "Ikkupjar falla"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
+msgid "Only superuser is allowed to install packages"
+msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "package %s is not found."
-msgstr "pakkett %s ma nstabx."
+msgid "One of the following packages is needed:"
+msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "qed jitneħħa s-sors \"%s\""
+msgid "What is your choice? (1-%d) "
+msgstr "X'tagħżel? (1-%d) "
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
+msgid "Package installation..."
+msgstr "Installazzjoni ta' pakketti..."
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Cancel"
-msgstr "Ikkanċella"
+msgid "Initializing..."
+msgstr "Qed jibda..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:435
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --src          - il-pakkett li jmiss huwa pakkett sors (l-istess bħal -"
-"s).\n"
+"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
+msgid "do you agree ?"
+msgstr "taqbel?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
+"L-installazzjoni ma tistax tkompli għax dawn il-pakketti jridu \n"
+"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
+"%s\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ma nistax naċċessa s-sors \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ma nistax noħloq sors \"%s\"\n"
-
-#: ../urpmf:1
+#: ../urpmi:461
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
+"%s"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
+"d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1551,366 +1514,408 @@ msgstr ""
 "Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - uri t-tags kollha.\n"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
+msgid "Press Enter when ready..."
+msgstr "Agħfas Enter meta tlesti..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "Qed jitniżżel il-pakkett \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% ta' %s lest, ħin = %s, rata = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "qed nikkopja l-fajl hdlist..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% lest, rata = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "is-sors virtwali \"%s\" għandu jkollu url ċar; sors injurat"
+msgid "Do you want to continue installation ?"
+msgstr "Trid tkompli l-installazzjoni ?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"L-installazzjoni falliet, xi fajls huma nieqsa:\n"
+"\n"
+"%s\n"
+"Forsi trid taġġorna d-database urpmi"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Tagħmel xejn"
+msgid "Installation failed"
+msgstr "installazzjoni falliet"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "qed tintuża medja assoċjata għal modalità parallela: %s"
+msgid "distributing %s"
+msgstr "qed jiġi distribwit %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "qed jiġi mmuntat %s"
+msgid "installing %s"
+msgstr "qed jiġi nstallat %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"ma nistax nieħu ħsieb is-sors \"%s\" peress li l-fajl tal-lista diġà qed "
-"jintuża minn sors ieħor"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% ta' %s lest, ħin = %s, rata = %s"
+msgid "%d installation transactions failed"
+msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
+msgid "Installation is possible"
+msgstr "Installazzjoni possibbli"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
+msgid "Everything already installed"
+msgstr "kollox diġà installat"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\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"
+"użu: urpmi.addmedia [għażliet] <isem><url> [with <direttorju_relattiv>]\n"
+"fejn <url> huwa wieħed minn:\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <isem tal-hdlist "
+"relattiv>\n"
+"       ftp://<host>/<path> with <isem tal-hdlist relattiv>\n"
+"       http://<host>/<path> with <isem tal-hdlist relattiv>\n"
+"       removable://<path>\n"
 "\n"
-"użu:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
+"u [għażliet] huma minn\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - uri l-gruppi flimkien ma' l-isem.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - oħloq sors ta' aġġornament.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "sors \"%s\" mhuwiex magħżul"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "qed jintuża ambjent speċifiku fuq %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - tippruvax tfittex fajls sinteżi jew hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ma nistax insib il-fajl hdlist għal \"%s\", sors injorat"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"ma nistax naċċessa s-sors \"%s\",\n"
-"dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
-"is-sors."
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - uri l-grupp.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - naddaf id-direttorju tal-cache tal-headers.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "ma nistax noħloq tranżazzjoni"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "qed jinġabu l-fajls rpm mis-sors \"%s\"..."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ma jistgħux jiġu miżjuda aġġornamenti ta' distribuzzjoni \"cooker\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+msgid "retrieving mirrors at %s ..."
+msgstr "qed jinġabu mirja minn %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "qed jiġi distribwit %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "installazzjoni falliet"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ma nistax naġġorna s-sors \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<isem tal-hdlist relattiv> mhux speċifikat\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - agħżel is-sorsi kollha li ma jitneħħewx.\n"
+msgid "`with' missing for network media\n"
+msgstr "\"with\" nieqes għal sors tan-network\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr ""
+msgid "unable to create medium \"%s\"\n"
+msgstr "ma nistax noħloq sors \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
-"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
+"użu: urpmi.removemedia [-a] <isem> ...\n"
+"fejn <isem> huwa l-isem tas-sors xi tneħħi.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, 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]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - agħżel is-sorsi kollha.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - oħloq sors ta' aġġornament.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"għażla \"%s\" mhux magħrufa\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr ""
-"  -y             - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "xejn x'inneħħi (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"l-element li trid tneħħi m'hux hemm\n"
+"(wieħed minn %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "deskrizzjoni tal-hdlist \"%s\" invalida fil-fajl hdlist"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"użu: urpmi.update [għażliet] <isem> ...\n"
+"fejn <isem> huwa l-isem tas-sors x'taġġorna.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "removing %s"
-msgstr "qed jitneħħa %s"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:40
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - uri d-daqs.\n"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - agħżel is-sorsi kollha li ma jitneħħewx.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "in order to keep %s"
-msgstr "sabiex inżomm %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:75
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "minħabba %s mhux sodisfatt"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"l-element li trid taġġorna m'hux hemm\n"
+"(wieħed minn %s)\n"
 
-#: ../_irpm:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"Installazzjoni awtomatika ta' pakketti...\n"
-"Int tlabt l-installazzjoni tal-pakkett %s\n"
+"urpmf verżjoni %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "urpmi database locked"
-msgstr "database urpmi imsakkar"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
 
-#: ../urpmi:1
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+
+#: ../urpmq:55
 #, fuzzy, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - illistja l-medji disponibbli.\n"
+
+#: ../urpmq:56
+#, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
-"                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - illistja nodi disponibbli għal --parallel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:58
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - elenka l-aliases paralleli disponibbli.\n"
+
+#: ../urpmq:60
+#, c-format
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - oħroġ il-headers għall-pakkett imsemmi mid-db urpmi\n"
+"                   għal stdout (root biss).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - agħti l-pakketti sorsi kollha qabel tniżżilhom (root "
+"biss).\n"
 
-#: ../urpmi:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - uri t-tags kollha.\n"
+
+#: ../urpmq:77
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - imponi tfittix \"fuzzy\" (l-istess bħal -y).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
 
-#: ../urpmq:1
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1919,40 +1924,81 @@ msgstr ""
 "  -u             - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
 "nstallata.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "due to missing %s"
-msgstr "minħabba %s nieqes"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr ""
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - uri informazzjoni utli f'forma li tinftiehem faċilment.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - uri l-gruppi flimkien ma' l-isem.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\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:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - uri l-pakketti disponibbli kollha.\n"
+
+#: ../urpmq:90
+#, c-format
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"użu: urpmi.update [għażliet] <isem> ...\n"
-"fejn <isem> huwa l-isem tas-sors x'taġġorna.\n"
+"  ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
+"spezzjonati.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
+msgid "--list-nodes can only be used with --parallel"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Wieħed minn dawn il-pakketti meħtieġa biex tinstalla %s:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "\"webfetch\" mhux magħruf `%s' !!!\n"
@@ -2120,9 +2166,6 @@ msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "ipprova urpmf --help għal iżjed għażliet"
 
-#~ msgid "no full media list was found"
-#~ msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "qed tiġi kkopjata l-lista sors ta' \"%s\"..."
 
diff --git a/po/nb.po b/po/nb.po
index 812535e0..df83f51d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-05 20:49+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -39,868 +39,778 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "installerer %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - oppretter automatisk alle media fra et installasjons-\n"
-"                   medium.\n"
+"Automatisk installasjon av pakker...\n"
+"Du ba om installasjon av pakke %s\n"
 
-#
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "kunne ikke åpne rpmdb"
+msgid "Is this OK?"
+msgstr "Er dette ok?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - vis denne hjelpemeldingen.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "En av følgende pakker behøves for å installere %s:"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "fjerner pakke %s"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: kommando ikke funnet\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kan ikke bruke parallel-modus med use-distrib-modus"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"bruk: %s [valg]\n"
+"hvor [valg] er fra\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Alt er allerede installert"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - vis denne hjelpemeldingen.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rengjør cache-katalog.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - begrens resultat til gitte gruppe.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "bruker prosess %d for å utføre transaksjon"
+msgid "                    defaults is %s.\n"
+msgstr "                    standard er %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - vis etikett provides: alle tilbud (flere linjer).\n"
+msgid "unknown protocol defined for %s"
+msgstr "ukjent protokoll definert for %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Hva er ditt valg? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "ingen webfetch funnet, støttede webfetch er: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "fant %d hoder i cache"
+msgid "unable to handle protocol: %s"
+msgstr "kunne ikke håndtere protokoll: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "det er flere pakker med samme rpm-filnavn \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaksfeil i konfigurasjonsfil ved linje %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - spesifiser bruker og passord til bruk for proxy\n"
-"                   autentifisering (format er <bruker:passord>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "medium \"%s\" prøver å bruke en allerede brukt hdlist, medium ignorert"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "utfører andre rundgang for å beregne avhengigheter\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "medium \"%s\" prøver å bruke en allerede brukt liste, medium ignorert"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "mottar rpm-fil [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kan ikke ta hånd om medium \"%s\" da liste-fil allerede blir brukt av et "
+"annet medium"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - list tilgjengelige parallel-aliaser.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kunne ikke bruke navn \"%s\" for navnløst medium da det allerede er brukt"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...mottak mislykket: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"kunne ikke ta medium \"%s\" i betraktning da ingen liste-fil [%s] eksisterer"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunne ikke inspisere liste-fil for \"%s\", medium ignorert"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kunne ikke bestemme medium av denne hdlist-filen [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binær ELLER operatør, sann hvis en av uttrykkene er "
-"sanne.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunne ikke nå hdlist-fil av \"%s\", media ignorert"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Pakkeinstallasjon..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kan ikke få tilgang til liste-fil av \"%s\", medium ignorert"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ugyldig rpm-filnavn [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "prøver å gå forbi eksisterende medium \"%s\", unngår"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuelt medium \"%s\" skal ikke ha definert hdlist- eller list-fil, medium "
+"ignorert"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installasjonstransjaksjon mislykket"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuelt medium \"%s\" burde ha en klar url, medium ignorert"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"kan ikke få adgang til første installasjonsmedium (ingen Mandrake/base/"
-"hdlists-fil funnet)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunne ikke finne hdlist-fil for \"%s\", media ignorert"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Beklager, ugyldig valg, prøv igjen\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunne ikke finne liste fil for \"%s\", medium ignorert"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Velg sted hvor fil skal lagres"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "usammenhengende liste-fil for \"%s\", medium ignorert"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - vis etikett summary: sammendrag.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunne ikke inspisere liste-fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Følgende pakker inneholder %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "for mange monteringspunkter for fjernbart medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Installer den"
+msgid "taking removable device as \"%s\""
+msgstr "tar fjernbar enhet som \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - bruk X grensesnitt.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "En av følgende pakker behøves:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kunne ikke motta sti for fjernbart medium \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"For å tilfredstille avhengigheter vil følgende pakker bli fjernet (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "kunne ikke skrive konfigurasjonsfil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - velg beste grensesnitt i henhold til miljøet:\n"
-"                   X eller tekstmodus.\n"
+msgid "write config file [%s]"
+msgstr "skriv konfigurasjonsfil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Laster ned pakke `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kan ikke bruke parallel-modus med use-distrib-modus"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Hva kan gjøres med binære rpm-filer når man bruker --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "kunne ikke spalte \"%s\" i fil [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - velg automatisk pakker for oppgradering av systemet.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "sjekker parallelhåndterer i fil [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "ingen pakke kalt %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "fant parallelhåndterer for noder: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - velg alle treff på kommandolinjen.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "bruker assosiert media for parallelmodus: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installasjon mislykket, noen filer mangler:\n"
-"%s\n"
-"Du ønsker antageligvis å oppdatere urpmidatabasen din"
+msgid "unable to use parallel option \"%s\""
+msgstr "kunne ikke bruke parallel-valg \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"bruk: urpmi.removemedia [-a] <navn> ...\n"
-"hvor <navn> er et mediumnavn som skal fjernes.\n"
+"--synthesis kan ikke brukes med --media, excludemedia, --sortmedia, --update "
+"eller --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Installasjonen kan ikke fortsette på grunn av at følgende pakker\n"
-"må fjernes for at andre skal bli oppgradert:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "sjekker syntese-fil [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' mangler for nettverksmedia\n"
+msgid "examining hdlist file [%s]"
+msgstr "sjekker hdlist-fil [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - list opp filer i pakke.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuelt medium \"%s\" er ikke lokalt, medium ignorert"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "ukjent pakke"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Installasjon er mulig"
+msgid "performing second pass to compute dependencies\n"
+msgstr "utfører andre rundgang for å beregne avhengigheter\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "hopper over pakke %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "ville installert i stedet for å oppgradere pakke %s"
 
-#: ../urpm.pm:1
+#
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kunne ikke ta medium \"%s\" i betraktning da ingen liste-fil [%s] eksisterer"
+msgid "unable to open rpmdb"
+msgstr "kunne ikke åpne rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medium \"%s\" eksisterer allerede"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan ikke legge til oppdateringer av en cooker distribusjon\n"
+msgid "virtual medium need to be local"
+msgstr "virtuelt medium trenger å være lokalt"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - informativt modus.\n"
+msgid "added medium %s"
+msgstr "lagt til medium %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiserer..."
+msgid "unable to access first installation medium"
+msgstr "kan ikke få tilgang til første installasjonsmedium"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lister opp tilgjengelige pakker.\n"
+msgid "copying hdlists file..."
+msgstr "kopierer hdlists-fil..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - vis alle etiketter.\n"
+msgid "...copying failed"
+msgstr "...kopiering feilet"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "usammenhengende medium \"%s\" merket fjernbart, men er det ikke"
+msgid "...copying done"
+msgstr "...kopiering ferdig"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuelt medium \"%s\" skal ikke ha definert hdlist- eller list-fil, medium "
-"ignorert"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "regner ut md5sum av kopierte kildehdlist (eller syntese)"
+"kan ikke få adgang til første installasjonsmedium (ingen Mandrake/base/"
+"hdlists-fil funnet)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - ekskluder sti separert med komma.\n"
+msgid "retrieving hdlists file..."
+msgstr "mottar hdlists-fil..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Trykk Enter når det er klart..."
+msgid "...retrieving done"
+msgstr "...ferdig mottatt"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ukjente valg '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...mottak mislykket: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - splitt opp i små transaksjoner hvis flere enn gitte "
-"pakker\n"
-"                   skal bli installert eller oppgradert,\n"
-"                   standard er %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "invalid hdlist beskrivelse \"%s\" i hdlists-filen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem med å lese syntese-fil av medium \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "prøver å velge ikke-eksisterende medium \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - bruk wget til å motta fjerne filer.\n"
+msgid "selecting multiple media: %s"
+msgstr "velger flere media: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - tillat søk i tilbud for å finne pakke.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lister tilgjengelige når --parallel brukes.\n"
+msgid "removing medium \"%s\""
+msgstr "fjerner medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bygger hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"klarte ikke å få tilgang til\"%s\",\n"
+"dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
+"opprettet."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - behold eksisterende pakker hvis mulig, avvis forespurte\n"
-"                   pakker som fører til fjerning.\n"
+"virtuelt medium \"%s\" burde ha en gyldig kildehdlist eller syntese, medium "
+"ignorert"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "kontrollerer MD5SUM-fil"
+msgid "copying description file of \"%s\"..."
+msgstr "kopierer beskrivelsesfil av \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: kommando ikke funnet\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "regner ut md5sum av eksisterende kildehdlist(eller syntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "ikke i stand til å registrere rpm-fil"
+msgid "examining MD5SUM file"
+msgstr "kontrollerer MD5SUM-fil"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - tillat å spørre bruker om å installere pakker uten\n"
-"                   sjekking av avhengigheter.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopierer kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kunne ikke håndtere protokoll: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiering av [%s] mislykket (fil er mistenkelig liten)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "mottar hdlists-fil..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "regner ut md5sum av kopierte kildehdlist (eller syntese)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ja, installer den"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiering av [%s] mislykket (md5sum stemmer ikke)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "lagt til medium %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - behold rpm som ikke er brukt i cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "leser rpm-filer fra [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"opprettet transaksjon for installasjon på %s (fjern=%d, installer=%d, "
-"oppgrader=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum stemmer ikke overens"
+msgid "no rpm files found from [%s]"
+msgstr "ingen rpm-filer funnet fra [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaksfeil i konfigurasjonsfil ved linje %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "mottar kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  navn eller rpm-filer gitt på kommandolinjen vil bli installert.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "fant test hdlist (eller syntese) som %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - bruk spesifisert HTTP proxy, portnummeret antas\n"
-"                   å være 1080 som standard (format er <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "regner ut md5sum av mottatte kildehdlist (eller syntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "for å kunne installere %s"
+msgid "md5sum mismatch"
+msgstr "md5sum stemmer ikke overens"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "fant igjen %s oppføringer i depsliste"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "mottak av kilde hdlist (eller syntese) mislykket"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignorer forskjell mellom små og store bokstaver i hver "
-"søkestreng.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil funnet for medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kan ikke opprette katalog [%s] for feilrapport"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ville installert i stedet for å oppgradere pakke %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ikke i stand til å tolke hdlist fil av  \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "mottar speil fra %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "kunne ikke skrive liste-fil av \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - vis etikett url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "skriver listefil for medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ukjent protokoll definert for %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "ingenting skrevet i liste-fil for \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - vis versjon og utgivelse også med navn.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "mottar offentlignøkkel-fil med beskrivelse av \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - vis etikett obsoletes: alle erstatninger (flere linjer).\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importerer nøkkel %s fra offentlignøkkel-fil av \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medium \"%s\" eksisterer allerede"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "kunne ikke importere offentlignøkkel-fil av \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "installerer %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "leser hoder fra medium \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"oppføringen til oppdatering mangler\n"
-"(en av %s)\n"
+msgid "building hdlist [%s]"
+msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "prøver å promotere %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bygd hdlist syntese-fil for medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kan ikke fjerne pakke %s"
+msgid "found %d headers in cache"
+msgstr "fant %d hoder i cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem med å lese syntese-fil av medium \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "fjerner %d foreldede hoder fra cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"oppføringen til fjerning mangler\n"
-"(en av %s)\n"
+msgid "mounting %s"
+msgstr "monterer %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - velg alle media.\n"
+msgid "unmounting %s"
+msgstr "demonterer %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Mangler signatur (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "fant igjen %s oppføringer i depsliste"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "ingen oppføringer funnet igjen i depsliste"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuert urpmi over maskiner av alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "ugyldig rpm-filnavn [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiering av [%s] mislykket (fil er mistenkelig liten)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "mottar rpm-fil [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "kunne ikke nå rpm-fil [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "unable to register rpm file"
+msgstr "ikke i stand til å registrere rpm-fil"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - begrens resultat til gitte gruppe.\n"
+msgid "error registering local packages"
+msgstr "feil ved registrering av lokale pakker"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "medium \"%s\" prøver å bruke en allerede brukt liste, medium ignorert"
+msgid "no package named %s"
+msgstr "ingen pakke kalt %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "maltraktert inndata: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker inneholder %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "fjerning av pakke %s vil ødelegge systemet ditt"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lister tilgjengelige medier.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kunne ikke korrekt tolke [%s] på verdi \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Noen av pakkene som er ønsket kan ikke installeres:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakke `%s' (%s/%s)..."
+"mediumet \"%s\" bruker en ugyldig liste-fil:\n"
+"  speilet er sannsynligvis ikke oppdatert, prøver å bruke en alternativ "
+"metode"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ingen oppføringer funnet igjen i depsliste"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medium \"%s\" definerer ikke noen lokasjon for rpm-filer"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installer bare kildepakke (ingen binære).\n"
+msgid "package %s is not found."
+msgstr "pakke %s er ikke funnet."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - bruk curl til å motta fjerne filer.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-database låst"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkluder perl-kodekatalog direkte som perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medium \"%s\" er ikke valgt"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "samtykker du ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunne ikke lese rpm-fil [%s] fra medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "usammenhengende liste-fil for \"%s\", medium ignorert"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "usammenhengende medium \"%s\" merket fjernbart, men er det ikke"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...ferdig mottatt"
+msgid "unable to access medium \"%s\""
+msgstr "kunne ikke nå media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "legger til pakke %s (id=%d, eid=%d, oppdater=%d, fil=%s)"
+msgid "malformed input: [%s]"
+msgstr "maltraktert inndata: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "hopper over pakke %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "mottar rpm-filer fra medium \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ugyldig signatur (%s)"
+msgid "Preparing..."
+msgstr "Forbereder..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  navn eller rpm-filer gitt på kommandolinjem er etterspurt.\n"
+msgid "using process %d for executing transaction"
+msgstr "bruker prosess %d for å utføre transaksjon"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versjon %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
-"\n"
-"bruk:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kunne ikke korrekt tolke [%s] på verdi \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ikke bruk gitte media, delt med komma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kunne ikke bestemme medium av denne hdlist-filen [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ikke i stand til å tolke hdlist fil av  \"%s\""
+"opprettet transaksjon for installasjon på %s (fjern=%d, installer=%d, "
+"oppgrader=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "medium \"%s\" prøver å bruke en allerede brukt hdlist, medium ignorert"
+msgid "unable to create transaction"
+msgstr "kunne ikke opprette transaksjon"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "pga. konflikter med %s"
+msgid "removing package %s"
+msgstr "fjerner pakke %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "fjerner %d foreldede hoder fra cache"
+msgid "unable to remove package %s"
+msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunne ikke oppdatere medium \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "legger til pakke %s (id=%d, eid=%d, oppdater=%d, fil=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
+msgid "unable to install package %s"
+msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuelt medium \"%s\" er ikke lokalt, medium ignorert"
+msgid "due to missing %s"
+msgstr "pga. manglende %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Forbereder..."
+msgid "due to unsatisfied %s"
+msgstr "pga. utilfredsstilt %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    standard er %s.\n"
+msgid "trying to promote %s"
+msgstr "prøver å promotere %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
+msgid "in order to keep %s"
+msgstr "for å kunne beholde %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ikke prøv å finn noe syntese- eller\n"
-"                   hdlist-fil.\n"
+msgid "in order to install %s"
+msgstr "for å kunne installere %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ikke søk i tilbud for å finne pakke.\n"
+msgid "due to conflicts with %s"
+msgstr "pga. konflikter med %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiering av [%s] mislykket (md5sum stemmer ikke)"
+msgid "unrequested"
+msgstr "ikke etterspurt"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre.\n"
-"                   Dette tillater å forespøre en distro.\n"
+msgid "Invalid signature (%s)"
+msgstr "Ugyldig signatur (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"bruk: %s [valg]\n"
-"hvor [valg] er fra\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Ugyldig nøkkelid (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - fjern rpm fra cache før noe annet.\n"
+msgid "Missing signature (%s)"
+msgstr "Mangler signatur (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"kunne ikke bruke navn \"%s\" for navnløst medium da det allerede er brukt"
+msgid "bad proxy declaration on command line\n"
+msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - vis etikett conflicts: alle konflikter.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan ikke lese rpm-fil \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuelt medium \"%s\" burde ha en gyldig kildehdlist eller syntese, medium "
-"ignorert"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Beklager, ugyldig valg, prøv igjen\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -916,1080 +826,1216 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - vis denne hjelpemeldingen.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - velg automatisk en pakke i valg.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"bruk: urpmi.addmedia [valg] <navn> <url> [with <relativ sti>]\n"
-"hvor <url> er en av\n"
-"       file://<sti>\n"
-"       ftp://<logginnnavn>:<passord>@<vert>/<sti> med <relativt filnavn til "
-"hdlist>\n"
-"       ftp://<vert>/<sti> with <relativt filnavn til hdlist>\n"
-"       http://<vert>/<sti> with <relativt til filnavn hdlist>\n"
-"       removable://<sti>\n"
-"\n"
-"og [valg] er fra\n"
+"  --test         - kontroller at installasjonen kan bli riktig gjennomført.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopierer kildehdlist (eller syntese) av \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - tving påkallelse selv om noen pakker ikke eksisterer.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiering ferdig"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuert urpmi over maskiner av alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "kunne ikke bruke parallel-valg \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - bruk en annen rot for rpm-installasjon.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"mediumet \"%s\" bruker en ugyldig liste-fil:\n"
-"  speilet er sannsynligvis ikke oppdatert, prøver å bruke en alternativ "
-"metode"
+"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
+"                   for å (av)installere en chroot med --root-opsjon.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "kan ikke få tilgang til første installasjonsmedium"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - informativt modus.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuelt medium trenger å være lokalt"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - velg alle pakker som matcher uttrykket.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "feil ved registrering av lokale pakker"
+msgid "unknown packages"
+msgstr "ukjente pakker"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - sett grense på nedlastningshastigheten.\n"
+msgid "unknown package"
+msgstr "ukjent pakke"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "fant test hdlist (eller syntese) som %s"
+msgid "removing package %s will break your system"
+msgstr "fjerning av pakke %s vil ødelegge systemet ditt"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "mottak av kilde hdlist (eller syntese) mislykket"
+msgid "Nothing to remove"
+msgstr "Ingenting å fjerne"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ingen rpm-filer funnet fra [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Sjekker fjerning av følgende pakker"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ingenting skrevet i liste-fil for \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"For å tilfredstille avhengigheter vil følgende pakker bli fjernet (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Følgende pakker har ugyldige signaturer"
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "regner ut md5sum av eksisterende kildehdlist(eller syntese)"
+msgid "removing %s"
+msgstr "fjerner %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "Removing failed"
+msgstr "Fjerning mislykket"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
+"urpmf versjon %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
+"\n"
+"bruk:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "kunne ikke installere pakke %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - bruk bare oppdateringsmedia.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - bruk bare gitte media, delt med komma.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ikke bruk gitte media, delt med komma.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - tillat å spørre bruker om å installere pakker uten\n"
-"                   sjekking av avhengighet og integritet.\n"
+"  --sortmedia    - sorter media etter understrenger separert med komma.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Lagre fil"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - bruk den gitte syntesen i stedet for urpmi-db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan ikke lese rpm-fil \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - informativt modus.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kunne ikke skrive konfigurasjonsfil [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - ikke vis etikettnavn (standard hvis ingen etikett gitt på "
+"kommandolinjen,\n"
+"                   inkompatibelt med interaktivt modus).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - velg alle pakker som matcher uttrykket.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ikke vis identiske linjer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ugyldig nøkkelid (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - vis alle etiketter.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - tving påkallelse selv om noen pakker ikke eksisterer.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - vis etikett group: gruppe.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kunne ikke motta sti for fjernbart medium \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - vis etikett size: størrelse.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - prøv å finn og bruk syntese-filen.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - vis etikett epoch: epoke.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - bruk den gitte syntese i stedet for urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - vis etikett summary: sammendrag.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - tving oppdatering av gpg-nøkkel.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - vis etikett description: beskrivelse.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativ sti til hdlist> mangler\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - vis etikett sourcerpm: kilderpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Sjekker fjerning av følgende pakker"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - vis etikett packager: pakker.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "ikke etterspurt"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - vis etikett buildhost: byggevert.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kunne ikke nå rpm-fil [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - vis etikett url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - vis etikett files: alle filer (flere linjer).\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - vis etikett provides: alle tilbud (flere linjer).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "kunne ikke spalte \"%s\" i fil [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - vis etikett requires: alle avhengigheter.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ønsker du å fortsette installasjonen ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - vis etikett files: alle filer (flere linjer).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunne ikke lese rpm-fil [%s] fra medium \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - vis etikett conflicts: alle konflikter.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
-"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
-"                   for å installere en chroot med --root-opsjon.\n"
+"  --obsoletes    - vis etikett obsoletes: alle erstatninger (flere linjer).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bygd hdlist syntese-fil for medium \"%s\""
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - bruk spesifikt miljø (typisk en feilrapport).\n"
 
-#: ../urpmq:1
+#: ../urpmf:59
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
-"  -i             - vis verdigfull informasjon i menneskelig lesbart format.\n"
+"  -i             - ignorer forskjell mellom små og store bokstaver i hver "
+"søkestreng.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - bruk spesifisert distribusjonsversjon, standard er tatt\n"
-"                   fra versjonen av distribusjonen gitt av den installerte\n"
-"                   mandrake-release pakken.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - vis versjon, utgivelse og arkitektur med navn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkluder perl-kodekatalog direkte som perl -e.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - bruk spesifisert url for liste over speil, standard er\n"
-"                   %s\n"
+"  -a             - binær OG operatør, sann hvis begge uttrykk er sanne.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
-"                   for å (av)installere en chroot med --root-opsjon.\n"
+"  -o             - binær ELLER operatør, sann hvis en av uttrykkene er "
+"sanne.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unær IKKE, sann hvis uttrykk er usann.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - venstre parantes for å åpne gruppeuttrykk.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - høyre parantes for å lukke gruppeuttrykk.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Katalogen [%s] eksisterer allerede, vennligst bruk en annen katalog "
-"forfeilrapportering eller slett den"
+"tilbakekall er :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "demonterer %s"
+msgid "using specific environment on %s\n"
+msgstr "bruker spesifikt miljø på %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ferdig, hastighet = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versjon %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
+"\n"
+"bruk:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "restarter urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - bruk den gitte syntese i stedet for urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sjekker syntese-fil [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - velg automatisk pakker for oppgradering av systemet.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prøve å installere enda hardere (--force)? (j/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - aldri spørr om å avinstallere en pakke, avbryt "
+"installasjonen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiering feilet"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - behold eksisterende pakker hvis mulig, avvis forespurte\n"
+"                   pakker som fører til fjerning.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunne ikke nå hdlist-fil av \"%s\", media ignorert"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - splitt opp i små transaksjoner hvis flere enn gitte "
+"pakker\n"
+"                   skal bli installert eller oppgradert,\n"
+"                   standard er %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stillemodus.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - liten transaksjonslengde, standard er %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - informativt modus.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - pålegg uklart søk (samme som -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - gir alle kildepakker før nedlasting (kun root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - neste pakke er en kildepakke (samme som -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - trekk ut hoder for pakke listet fra urpmi-db til\n"
-"                   stdout (kun root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installer bare kildepakke (ingen binære).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "ukjente pakker"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - fjern rpm fra cache før noe annet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "velger flere media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - behold rpm som ikke er brukt i cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - vis versjon, utgivelse og arkitektur med navn.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - tillat å spørre bruker om å installere pakker uten\n"
+"                   sjekking av avhengigheter.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - tillat å spørre bruker om å installere pakker uten\n"
+"                   sjekking av avhengighet og integritet.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre, nyttig\n"
+"                   for å installere en chroot med --root-opsjon.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunne ikke finne liste fil for \"%s\", medium ignorert"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - bruk wget til å motta fjerne filer.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - vis denne hjelpemeldingen.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - bruk curl til å motta fjerne filer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "fant parallelhåndterer for noder: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - sett grense på nedlastningshastigheten.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"tilbakekall er :\n"
-"%s\n"
+"  --resume       - gjenoppta overføring av delvis nedlastede filer\n"
+"                   (--no-resume deaktiverer det, deaktivert er standard).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reversert søk til hva som krever pakke.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - bruk spesifisert HTTP proxy, portnummeret antas\n"
+"                   å være 1080 som standard (format er <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versjon %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
-"\n"
-"bruk:\n"
+"  --proxy-user   - spesifiser bruker og passord til bruk for proxy\n"
+"                   autentifisering (format er <bruker:passord>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - ikke vis etikettnavn (standard hvis ingen etikett gitt på "
-"kommandolinjen,\n"
-"                   inkompatibelt med interaktivt modus).\n"
+"  --bug          - skriv ut en feilrapport i katalog indikert av\n"
+"                   neste argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ikke vis identiske linjer.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - bruk X grensesnitt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis kan ikke brukes med --media, excludemedia, --sortmedia, --update "
-"eller --parallel"
+"  --best-output  - velg beste grensesnitt i henhold til miljøet:\n"
+"                   X eller tekstmodus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - bruk spesifisert arkitektur, standard er arkitektur fra\n"
-"                   mandrake-release-pakke som er installert.\n"
+"  --verify-rpm   - verifiser rpm-signatur før installasjon.\n"
+"                   (--no-verify-rpm deaktiverer det, standard er aktivert).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Er dette ok?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - ekskluder sti separert med komma.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - ekskluder dokumentfiler.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - bruk den gitte syntesen i stedet for urpmi-db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - velg alle treff på kommandolinjen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "sjekker parallelhåndterer i fil [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - tillat søk i tilbud for å finne pakke.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting å fjerne"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ikke søk i tilbud for å finne pakke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importerer nøkkel %s fra offentlignøkkel-fil av \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - pålegg uklart søk (samme som --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "leser hoder fra medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - utvid forespørsel til pakkeavhengigheter.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stillemodus.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - skriv ut en feilrapport i katalog indikert av\n"
-"                   neste argument.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  navn eller rpm-filer gitt på kommandolinjen vil bli installert.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medium \"%s\" definerer ikke noen lokasjon for rpm-filer"
+msgid "Choose location to save file"
+msgstr "Velg sted hvor fil skal lagres"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - vis etikett sourcerpm: kilderpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Hva kan gjøres med binære rpm-filer når man bruker --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunne ikke skrive liste-fil av \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Du har valgt en kildepakke:\n"
+"\n"
+"%s\n"
+"\n"
+"Du ønsket trolig ikke å installere den på din maskin (å installere den\n"
+"vil tillate deg å gjøre endringen til dens kildekode for så å kompilere "
+"den).\n"
+"\n"
+"Hva ønsker du å gjøre?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - vis etikett requires: alle avhengigheter.\n"
+msgid "Do nothing"
+msgstr "Gjør ingenting"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "prøver å velge ikke-eksisterende medium \"%s\""
+msgid "Yes, really install it"
+msgstr "Ja, installer den"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - vis etikett description: beskrivelse.\n"
+msgid "Save file"
+msgstr "Lagre fil"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiering feilet"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Du er på vei til å installere de følgende programvarepakkene på din maskin:\n"
+"\n"
+"%s\n"
+"\n"
+"Det kan være at du bare foretrekker å lagre den. Hva er ditt valg?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - tving generasjon av hdlist-filer.\n"
+msgid "Install it"
+msgstr "Installer den"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan bare brukes med --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Katalogen [%s] eksisterer allerede, vennligst bruk en annen katalog "
+"forfeilrapportering eller slett den"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil funnet for medium \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kan ikke opprette katalog [%s] for feilrapport"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
+msgid "Copying failed"
+msgstr "Kopiering feilet"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "installerer %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Bare superbruker har adgang til å installere pakker"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "leser rpm-filer fra [%s]"
+msgid "One of the following packages is needed:"
+msgstr "En av følgende pakker behøves:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierer beskrivelsesfil av \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - velg automatisk en pakke i valg.\n"
+msgid "Package installation..."
+msgstr "Pakkeinstallasjon..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Fjerning mislykket"
+msgid "Initializing..."
+msgstr "Initialiserer..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - lag virtuelt media som alltid er oppdatert,\n"
-"                   bare file:// protokoll er tillatt.\n"
+"Noen av pakkene som er ønsket kan ikke installeres:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "pakke %s er ikke funnet."
+msgid "do you agree ?"
+msgstr "samtykker du ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "fjerner medium \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Installasjonen kan ikke fortsette på grunn av at følgende pakker\n"
+"må fjernes for at andre skal bli oppgradert:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ingen grunn til å gi <relativ sti til hdlist> med --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Du må være root for å installere følgende avhengigheter:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - neste pakke er en kildepakke (samme som -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - bruk spesifikt miljø (typisk en feilrapport).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorter media etter understrenger separert med komma.\n"
+msgid "Press Enter when ready..."
+msgstr "Trykk Enter når det er klart..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunne ikke nå media \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "Laster ned pakke `%s'..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunne ikke opprette medium \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - vis etikett packager: pakker.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ferdig, hastighet = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dump konfigurasjonen i form av et urpmi.addmedia-"
-"argument.\n"
+msgid "The following packages have bad signatures"
+msgstr "Følgende pakker har ugyldige signaturer"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ønsker du å fortsette installasjonen ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Du må være root for å installere følgende avhengigheter:\n"
+"Installasjon mislykket, noen filer mangler:\n"
 "%s\n"
+"Du ønsker antageligvis å oppdatere urpmidatabasen din"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - vis changelog.\n"
+msgid "Installation failed"
+msgstr "Installasjon mislykket"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kan ikke få tilgang til liste-fil av \"%s\", medium ignorert"
+msgid "distributing %s"
+msgstr "distribuerer %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - høyre parantes for å lukke gruppeuttrykk.\n"
+msgid "installing %s"
+msgstr "installerer %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "ingen webfetch funnet, støttede webfetch er: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "sjekker hdlist-fil [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prøve å installere uten å sjekke avhengigheter? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopierer hdlists-fil..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prøve å installere enda hardere (--force)? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skriver listefil for medium \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d installasjonstransjaksjon mislykket"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuelt medium \"%s\" burde ha en klar url, medium ignorert"
+msgid "Installation is possible"
+msgstr "Installasjon er mulig"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - vis etikett buildhost: byggevert.\n"
+msgid "Everything already installed"
+msgstr "Alt er allerede installert"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Gjør ingenting"
+msgid "restarting urpmi"
+msgstr "restarter urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"bruk: urpmi.addmedia [valg] <navn> <url> [with <relativ sti>]\n"
+"hvor <url> er en av\n"
+"       file://<sti>\n"
+"       ftp://<logginnnavn>:<passord>@<vert>/<sti> med <relativt filnavn til "
+"hdlist>\n"
+"       ftp://<vert>/<sti> with <relativt filnavn til hdlist>\n"
+"       http://<vert>/<sti> with <relativt til filnavn hdlist>\n"
+"       removable://<sti>\n"
+"\n"
+"og [valg] er fra\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "bruker assosiert media for parallelmodus: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - opprett et oppdateringsmedium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "monterer %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - prøv å finn og bruk syntese-filen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"kan ikke ta hånd om medium \"%s\" da liste-fil allerede blir brukt av et "
-"annet medium"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - prøv å finne og bruke hdlist-fil.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "kunne ikke få tak i kildepakker, avslutter"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ikke prøv å finn noe syntese- eller\n"
+"                   hdlist-fil.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - bruk en annen rot for rpm-installasjon.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - oppretter automatisk alle media fra et installasjons-\n"
+"                   medium.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s ferdig, ETA = %s, hastighet = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - oppretter automatisk et media for XXX-del av en\n"
+"                   distribusjon, XXX kan være main, contrib, updates\n"
+"                   eller alt annet som har blitt konfigurert ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "regner ut md5sum av mottatte kildehdlist (eller syntese)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - bruk spesifisert url for liste over speil, standard er\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "kunne ikke importere offentlignøkkel-fil av \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - bruk spesifisert distribusjonsversjon, standard er tatt\n"
+"                   fra versjonen av distribusjonen gitt av den installerte\n"
+"                   mandrake-release pakken.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - aldri spørr om å avinstallere en pakke, avbryt "
-"installasjonen.\n"
+"  --arch         - bruk spesifisert arkitektur, standard er arkitektur fra\n"
+"                   mandrake-release-pakke som er installert.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
+"  --virtual      - lag virtuelt media som alltid er oppdatert,\n"
+"                   bare file:// protokoll er tillatt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "mottar kildehdlist (eller syntese) av \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktiver MD5SUM-filsjekking.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - vis grupper også med navn.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rengjør cache-katalog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medium \"%s\" er ikke valgt"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - tving generasjon av hdlist-filer.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Bare superbruker har adgang til å installere pakker"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan ikke legge til oppdateringer av en cooker distribusjon\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "bruker spesifikt miljø på %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "mottar speil fra %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunne ikke finne hdlist-fil for \"%s\", media ignorert"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ingen grunn til å gi <relativ sti til hdlist> med --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - liten transaksjonslengde, standard er %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunne ikke oppdatere medium \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - venstre parantes for å åpne gruppeuttrykk.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sti til hdlist> mangler\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "for mange monteringspunkter for fjernbart medium \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' mangler for nettverksmedia\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binær OG operatør, sann hvis begge uttrykk er sanne.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunne ikke opprette medium \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"klarte ikke å få tilgang til\"%s\",\n"
-"dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
-"opprettet."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - vis etikett group: gruppe.\n"
+"bruk: urpmi.removemedia [-a] <navn> ...\n"
+"hvor <navn> er et mediumnavn som skal fjernes.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - bruk bare gitte media, delt med komma.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - velg alle media.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "kunne ikke opprette transaksjon"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"ukjente valg '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "mottar rpm-filer fra medium \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Du har valgt en kildepakke:\n"
-"\n"
-"%s\n"
-"\n"
-"Du ønsket trolig ikke å installere den på din maskin (å installere den\n"
-"vil tillate deg å gjøre endringen til dens kildekode for så å kompilere "
-"den).\n"
-"\n"
-"Hva ønsker du å gjøre?"
+"oppføringen til fjerning mangler\n"
+"(en av %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuerer %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"bruk: urpmi.update [valg] <navn> ...\n"
+"hvor <navn> er et mediumnavn som skal oppdateres.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Installasjon mislykket"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "skriv konfigurasjonsfil [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - tving oppdatering av gpg-nøkkel.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - velg alle ikke-fjernbare media.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - vis etikett epoch: epoke.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifiser rpm-signatur før installasjon.\n"
-"                   (--no-verify-rpm deaktiverer det, standard er aktivert).\n"
+"oppføringen til oppdatering mangler\n"
+"(en av %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versjon %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
+"\n"
+"bruk:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vennligst sett inn mediumet kalt \"%s\" på enhet [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lister opp tilgjengelige pakker.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - opprett et oppdateringsmedium.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lister tilgjengelige medier.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lister tilgjengelige medier og deres url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - pålegg uklart søk (samme som --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dump konfigurasjonen i form av et urpmi.addmedia-"
+"argument.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "invalid hdlist beskrivelse \"%s\" i hdlists-filen"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - lister tilgjengelige når --parallel brukes.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "fjerner %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - list tilgjengelige parallel-aliaser.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - oppretter automatisk et media for XXX-del av en\n"
-"                   distribusjon, XXX kan være main, contrib, updates\n"
-"                   eller alt annet som har blitt konfigurert ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - vis etikett size: størrelse.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "for å kunne beholde %s"
+"  --headers      - trekk ut hoder for pakke listet fra urpmi-db til\n"
+"                   stdout (kun root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "pga. utilfredsstilt %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - gir alle kildepakker før nedlasting (kun root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Automatisk installasjon av pakker...\n"
-"Du ba om installasjon av pakke %s\n"
+"  --use-distrib  - konfigurer urpmi fortgående fra et distrib-tre.\n"
+"                   Dette tillater å forespøre en distro.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-database låst"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - vis changelog.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - gjenoppta overføring av delvis nedlastede filer\n"
-"                   (--no-resume deaktiverer det, deaktivert er standard).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - utvid forespørsel til pakkeavhengigheter.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "mottar offentlignøkkel-fil med beskrivelse av \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - fjerner pakke hvis en nyere versjon allerede er er "
+"installert.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktiver MD5SUM-filsjekking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr ""
+"  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tar fjernbar enhet som \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reversert søk til hva som krever pakke.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Du er på vei til å installere de følgende programvarepakkene på din maskin:\n"
-"\n"
-"%s\n"
-"\n"
-"Det kan være at du bare foretrekker å lagre den. Hva er ditt valg?"
+"  -i             - vis verdigfull informasjon i menneskelig lesbart format.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - pålegg uklart søk (samme som -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - vis grupper også med navn.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - fjerner pakke hvis en nyere versjon allerede er er "
-"installert.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - vis versjon og utgivelse også med navn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - prøv å finne og bruke hdlist-fil.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - list opp filer i pakke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "pga. manglende %s"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  navn eller rpm-filer gitt på kommandolinjem er etterspurt.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - bruk bare oppdateringsmedia.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan bare brukes med --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"bruk: urpmi.update [valg] <navn> ...\n"
-"hvor <navn> er et mediumnavn som skal oppdateres.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "prøver å gå forbi eksisterende medium \"%s\", unngår"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "ingen full medialiste ble funnet"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - kontroller at installasjonen kan bli riktig gjennomført.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "En av følgende pakker behøves for å installere %s:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Ukjent webfetch `%s' !!!\n"
@@ -2161,9 +2207,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "prøv urpmf --help for flere valg"
 
-#~ msgid "no full media list was found"
-#~ msgstr "ingen full medialiste ble funnet"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "kopierer kildefil av \"%s\"..."
 
diff --git a/po/nl.po b/po/nl.po
index 7fd857a8..d1ee7c54 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-25 14:49-0500\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Nederlands\n"
@@ -42,2004 +42,2050 @@ msgstr "YyJj"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "bezig met installeren van %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - maakt automatisch alle media van een installatiemedium\n"
-"                    aan.\n"
+"Automatische installatie van pakketten...\n"
+"U vroeg de installatie van pakket %s aan\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "kon rpmdb niet openen"
+msgid "Is this OK?"
+msgstr "Is dit goed?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - geeft deze hulptekst.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "bezig met verwijderen van pakket %s"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: opdracht niet gevonden\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kan parallelle modus niet tegelijk met use-distrib modus gebruiken"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"gebruik: %s [opties]\n"
+"waarbij [opties] komen uit de volgende\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Alles is al geïnstalleerd"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - geeft deze hulptekst.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - buffermap headers wissen.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  -g [groep]      - bepertkt resultaten tot gegeven groep.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "proces %d gebruikt voor uitvoeren van transactie"
+msgid "                    defaults is %s.\n"
+msgstr "                    standaard is %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - geeft de tag provides: alle 'levert's.\n"
+msgid "unknown protocol defined for %s"
+msgstr "onbekend protocol gedefinieerd voor %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Wat is uw keuze? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d headers in de buffer gevonden"
+msgid "unable to handle protocol: %s"
+msgstr "kon protocol niet verwerken: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "er zijn meerdere pakketten met dezelfde rpm bestandsnaam \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaxfout in configuratiebestand op regel %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - specificeer gebruikersnaam en wachtwoord voor proxy-\n"
-"                    aanmelding (formaat is <gebruiker:wachtwoord>).\n"
+"medium \"%s\" probeert een hdlist te gebruiken die al wordt gebruikt, medium "
+"genegeerd"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"medium \"%s\" probeert een al gebruikte lijst te gebruiken, medium genegeerd"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "bezig met ontvangen van rpm bestand [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kon medium \"%s\" niet verzorgen, omdat het list bestand al in gebruik is "
+"door een ander medium"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - beschikbare parallelle aliasen opsommen.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kan naam \"%s\" niet gebruiken voor naamloos medium omdat deze al in gebruik "
+"is"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...ontvangen mislukt: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"kon geen rekening houden met het medium \"%s\", omdat lijstbestand [%s] niet "
+"bestaat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kon list bestaand voor \"%s\" niet inspecteren, medium genegeerd"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kon medium van dit hdlist bestand niet vaststellen [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binaire OR operator, waar als een expressie waar is.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Pakket-installatie..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ongeldige rpm-bestandsnaam [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "bezig met proberen bestaand medium \"%s\" te omzeilen"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"Virtueel medium \"%s\" zou geen gedefinieerde hdlist moeten hebben, medium "
+"genegeerd"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installatie-transacties mislukt"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "Virtueel medium \"%s\" moet een leeg url hebben, medium genegeerd"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"kon het eerste installatiemedium niet vinden (geen Mandrake/base/hdlists "
-"bestanden gevonden)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kon hdlist bestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, foutieve keuze, probeer een andere\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kan het lijstbestand voor \"%s\" niet vinden, medium genegeerd"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Kies map om bestand in op te slaan"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "onsamenhangend lijst-bestand voor \"%s\", medium genegeerd"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - geeft de tag summary: samenvatting.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kon list bestaand voor \"%s\" niet inspecteren, medium genegeerd"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "De volgende pakketten bevatten %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "teveel koppelpunten voor verwisselbaar medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Pakket installeren"
+msgid "taking removable device as \"%s\""
+msgstr "gebruikt verwisselbare schijf als \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - gebruik een grafische interface.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "gebruikt andere verwisselbare schijf [%s] voor \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Eén van de volgende pakketten is benodigd:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Om aan de afhankelijkheden te voldoen, worden de volgende pakketten "
-"verwijderd (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "kon configuratiebestand [%s] niet wegschrijven"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - gebruik de beste interface afhankelijk van de omgeving:\n"
-"                   grafische of tekst modus.\n"
+msgid "write config file [%s]"
+msgstr "config-bestand [%s] wegschrijven"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Bezig met downloaden van pakket `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kan parallelle modus niet tegelijk met use-distrib modus gebruiken"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Wat er gebeurt met uitvoerbare rpm bestanden bij --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatisch pakketten selecteren voor "
-"systeemopwaardering.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "geen pakket genaamd %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "parallelle handler gevonden voor knooppunten: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - selecteer alle resultaten van console.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installatie is mislukt, sommige bestanden missen:\n"
-"%s\n"
-"Misschien moet u de urpmi database opwaarderen"
+msgid "unable to use parallel option \"%s\""
+msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"gebruik: urpmi.removemedia [-a] <naam> ...\n"
-"waar <naam> is een medium naam die verwijderd moet worden.\n"
+"--synthesis kan niet gebruikt worden met --media, --excludemedia, --"
+"sortmedia, --update of --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"De volgende pakketten moeten worden verwijderd om andere te kunnen "
-"opwaarderen:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "bezig met onderzoeken van het synthesis bestand [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' ontbreekt voor netwerkmedia\n"
+msgid "examining hdlist file [%s]"
+msgstr "bezig met onderzoeken hdlist bestand [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - geeft alle bestanden in pakket weer\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "Virtueel medium \"%s\" is geen lokaal medium, genegeerd"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "onbekend pakket"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "probleem met lezen van hdlist of synthesis bestand van medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Installatie is mogelijk"
+msgid "performing second pass to compute dependencies\n"
+msgstr "uitvoeren tweede fase, controleren van afhankelijkheden\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"De volgende pakketten moeten worden verwijderd om andere te kunnen "
-"opwaarderen:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "pakket %s overslaan"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
-"geïnstalleerd (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "Zou pakket %s installeren, niet opwaarderen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"kon geen rekening houden met het medium \"%s\", omdat lijstbestand [%s] niet "
-"bestaat"
+msgid "unable to open rpmdb"
+msgstr "kon rpmdb niet openen"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medium \"%s\" bestaat al"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan geen updates van een cooker distributie toevoegen\n"
+msgid "virtual medium need to be local"
+msgstr "Virtueel medium moet lokaal zijn"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 'extra informatie'-modus.\n"
+msgid "added medium %s"
+msgstr "toegevoegd medium %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initialiseren..."
+msgid "unable to access first installation medium"
+msgstr "kon het eerste installatiemedium niet vinden"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list          - geeft alle beschikbare pakketten weer\n"
+msgid "copying hdlists file..."
+msgstr "bezig met kopiëren hdlist bestanden"
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - geeft alle tags weer.\n"
+msgid "...copying failed"
+msgstr "...kopiëren mislukt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
+msgid "...copying done"
+msgstr "...kopiëren is klaar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"Virtueel medium \"%s\" zou geen gedefinieerde hdlist moeten hebben, medium "
-"genegeerd"
+"kon het eerste installatiemedium niet vinden (geen Mandrake/base/hdlists "
+"bestanden gevonden)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "berekenen md5sum van gekopieerde bron hdlist (of synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "bezig met ontvangen van hdlists bestand..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - pad (gescheiden door komma) uitsluiten.\n"
+msgid "...retrieving done"
+msgstr "...ontvangen is klaar"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Druk op Enter wanneer u klaar bent..."
+msgid "...retrieving failed: %s"
+msgstr "...ontvangen mislukt: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"onbekende opties '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "ongeldige hdlist omschrijving \"%s\" in hdlists bestand"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - splitsen in kleinere transacties wanneer meer dan het\n"
-"                   aangegeven aantal pakketten worden geïnstalleerd of\n"
-"                   opgewaardeerd, standaard is %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "probeert een onbestaand medium \"%s\" te selecteren"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "probleem met lezen van hdlist of synthesis bestand van medium \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "selecteren van meerdere media: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - wget gebruiken om bestanden op afstand te ontvangen.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "bezig met verwijderen van medium \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - staat zoeken toe in 'levert' om een pakket te vinden.\n"
+"kan geen toegang tot medium \"%s\" verkrijgen,\n"
+"dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het aanmaken "
+"van het medium."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - beschikbare knooppunten opsommen bij --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"Virtueel medium \"%s\" moet een geldige bron hdlist of synthesis hebben, "
+"medium genegeerd"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "bezig met bouwen hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - behoud bestaande pakketten wanneer dit mogelijk is, "
-"negeer gevraagde\n"
-"                   pakketten die tot verwijderen nopen.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "berekenen md5sum van bestaande bron hdlist (of synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "bezig met onderzoeken MD5SUM bestand"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: opdracht niet gevonden\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "bezig met kopiëren bron hdlist (of synthesis) van \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "kon rpm-bestand niet registreren"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
-"                    installeren zonder afhankelijkhedencontrole.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "berekenen md5sum van gekopieerde bron hdlist (of synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kon protocol niet verwerken: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiëren van [%s] mislukt (md5sum onjuist)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "bezig met ontvangen van hdlists bestand..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Doorgaan met installatie"
+msgid "reading rpm files from [%s]"
+msgstr "bezig met lezen van rpm-bestanden van [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "toegevoegd medium %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - houd niet gebruikte rpms in cache.\n"
+msgid "no rpm files found from [%s]"
+msgstr "geen rpm bestanden gevonden van [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
-"d, vernieuwen=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "afgezochte hdlist (of synthesis) gevonden als %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "berekenen md5sum van ontvangen bron hdlist (of synthesis)"
+
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum verschillend"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaxfout in configuratiebestand op regel %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "ontvangen van bron hdlist (of synthesis) is mislukt"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  namen of rpm bestanden gegeven via opdrachtregel worden geïnstalleerd.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "geen hdlist-bestand gevonden voor medium \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - gebruik specifieke HTTP proxy, het standaard poort "
-"nummer\n"
-"                    is 1080 (formaat is <proxyhost[:poort]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "bestand [%s] reeds gebruik in hetzelfde medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "in volgorde om %s te installeren"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "kan het hdlist-bestand van \"%s\" niet analyseren"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "%s van plaats veranderde ingangen in lijst van afhankelijkheden"
+msgid "unable to write list file of \"%s\""
+msgstr "kon lijstbestand van \"%s\" niet schrijven"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
-"negeren.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
+msgid "nothing written in list file for \"%s\""
+msgstr "er is niets geschreven in het lijstbestand voor \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "Zou pakket %s installeren, niet opwaarderen"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "ontvangen van mirrors op %s..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - geeft de tag url: url.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "onbekend protocol gedefinieerd voor %s"
+msgid "reading headers from medium \"%s\""
+msgstr "bezig met lezen van headers van medium \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - geeft de versie en release samen met de naam.\n"
+msgid "building hdlist [%s]"
+msgstr "bezig met bouwen hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - geeft de tag obsoletes: alle verouderden\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medium \"%s\" bestaat al"
+msgid "found %d headers in cache"
+msgstr "%d headers in de buffer gevonden"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "bezig met installeren van %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "bezig met het verwijderen van %d verouderde titels in de cache"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"de invoer om op te waarderen ontbreekt\n"
-"(één van %s)\n"
+msgid "mounting %s"
+msgstr "%s koppelen..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "probeer %s op te waarderen"
+msgid "unmounting %s"
+msgstr "%s afkoppelen..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kon pakket %s niet verwijderen"
+msgid "relocated %s entries in depslist"
+msgstr "%s van plaats veranderde ingangen in lijst van afhankelijkheden"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "geen ingangen van plaats veranderd in depslist"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"het te verwijderen item ontbreekt\n"
-"(één van %s)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - alle media selecteren.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "bezig met ontvangen van rpm bestand [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Geen ondertekening aanwezig (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "kon rpm-bestand [%s] niet benaderen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kon rpm-bestanden niet lezen van [%s]: %s"
+msgid "unable to register rpm file"
+msgstr "kon rpm-bestand niet registreren"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
+msgid "error registering local packages"
+msgstr "registreren van lokale pakketten is mislukt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
+msgid "no package named %s"
+msgstr "geen pakket genaamd %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - vernieuw alleen bijwerkmedia.\n"
+msgid "The following packages contain %s: %s"
+msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "er zijn meerdere pakketten met dezelfde rpm bestandsnaam \"%s\""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  -g [groep]      - bepertkt resultaten tot gegeven groep.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kon [%s] niet correct verwerken op waarde \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"medium \"%s\" probeert een al gebruikte lijst te gebruiken, medium genegeerd"
+"medium \"%s\" gebruikt een ongeldig lijstbestand:\n"
+"  mirror is wellicht niet up-to-date, probeert nu een alternatieve methode"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "ongeldige invoer [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medium \"%s\" bevat geen locatie voor rpm bestanden"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "het verwijderen van %s zal uw systeem verstoren"
+msgid "package %s is not found."
+msgstr "pakket %s is niet gevonden."
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - beschikbare media opsommen.\n"
+msgid "urpmi database locked"
+msgstr "urpmi database geblokkeerd"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Bepaalde gevraagde pakketten konden niet worden geïnstalleerd:\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "medium \"%s\" is niet geselecteerd"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "geen ingangen van plaats veranderd in depslist"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"onsamenhangend medium \"%s\" als verwisselbaar gemarkeerd, maar is dit niet"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - installeer alleen bronpakketten (geen uitvoerbare "
-"bestanden)\n"
+msgid "unable to access medium \"%s\""
+msgstr "kon medium \"%s\" niet benaderen"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - gebruik curl om bestanden op afstand te ontvangen.\n"
+msgid "malformed input: [%s]"
+msgstr "ongeldige invoer [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "Bent u het daarmee eens?"
+msgid "Preparing..."
+msgstr "Bezig met voorbereiden..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "onsamenhangend lijst-bestand voor \"%s\", medium genegeerd"
+msgid "using process %d for executing transaction"
+msgstr "proces %d gebruikt voor uitvoeren van transactie"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...ontvangen is klaar"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transactie aangemaakt om te installeren op %s (verwijderen=%d, installeren=%"
+"d, vernieuwen=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "toevoegen van pakket %s (id=%d, eid=%d, update=%d, bestand=%s)"
+msgid "unable to create transaction"
+msgstr "Niet in staat om transactie aan te maken."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "pakket %s overslaan"
+msgid "removing package %s"
+msgstr "bezig met verwijderen van pakket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ongeldige ondertekening (%s)"
+msgid "unable to remove package %s"
+msgstr "kon pakket %s niet verwijderen"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  namen van rpm bestanden opgegeven via console zijn in de wachtrij "
-"geplaatst\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "toevoegen van pakket %s (id=%d, eid=%d, update=%d, bestand=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versie %s\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+msgid "unable to install package %s"
+msgstr "kon volgend pakket niet installeren: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kon [%s] niet correct verwerken op waarde \"%s\""
+msgid "due to missing %s"
+msgstr "vanwege missende %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
+msgid "due to unsatisfied %s"
+msgstr "vanwege onvoldane %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kon medium van dit hdlist bestand niet vaststellen [%s]"
+msgid "trying to promote %s"
+msgstr "probeer %s op te waarderen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "kan het hdlist-bestand van \"%s\" niet analyseren"
+msgid "in order to keep %s"
+msgstr "Om %s te behouden"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"medium \"%s\" probeert een hdlist te gebruiken die al wordt gebruikt, medium "
-"genegeerd"
+msgid "in order to install %s"
+msgstr "in volgorde om %s te installeren"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "bezig met het verwijderen van %d verouderde titels in de cache"
+msgid "unrequested"
+msgstr "ongevraagd"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kon medium \"%s\" niet bijwerken\n"
+msgid "Invalid signature (%s)"
+msgstr "Ongeldige ondertekening (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr ""
-"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "Ongeldig sleutel-ID (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "Virtueel medium \"%s\" is geen lokaal medium, genegeerd"
+msgid "Missing signature (%s)"
+msgstr "Geen ondertekening aanwezig (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "Bezig met voorbereiden..."
+msgid "bad proxy declaration on command line\n"
+msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    standaard is %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "gebruikt andere verwisselbare schijf [%s] voor \"%s\""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, foutieve keuze, probeer een andere\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     -  probeer geen synthesis of hdlist bestand te\n"
-"                   vinden.\n"
+"urpme versie %s\n"
+"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - niet in 'provides' zoeken om een pakket te vinden.\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - geeft deze hulptekst.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiëren van [%s] mislukt (md5sum onjuist)"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selecteer automatisch een pakket uit de keuzes.\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom.\n"
-"                   Hiermee kunt u de distro bevragen.\n"
+"  --test         - verifiëren dat de installatie correct uitgevoerd kan "
+"worden.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"gebruik: %s [opties]\n"
-"waarbij [opties] komen uit de volgende\n"
+"  --force        - aanroep forceren zelfs als sommige pakketten niet "
+"bestaan.\n"
 
-#: ../urpmi:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - gedistribueerde urpmi over computers van alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
-"kan naam \"%s\" niet gebruiken voor naamloos medium omdat deze al in gebruik "
-"is"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - geeft de tag conflicts: alle conflicten.\n"
+"  --root         - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"Virtueel medium \"%s\" moet een geldige bron hdlist of synthesis hebben, "
-"medium genegeerd"
+"  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom, handig\n"
+"                   om een chroot te (de)installeren met de --root optie.\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versie %s\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 'extra informatie'-modus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"gebruik: urpmi.addmedia [opties] <naam> <url> [with <relatief_pad>]\n"
-"waar <url> één van de volgende is:\n"
-"       file://<pad>\n"
-"       ftp://<gebruikersnaam>:<wachtwoord>@<host>/<pad> with <relatieve "
-"bestandsnaam van hdlist>\n"
-"       ftp://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
-"       http://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
-"       removable://<pad>\n"
-"\n"
-"en [opties] kunnen zijn:\n"
+"  -a             - selecteer alle pakketten die overeenkomen met de "
+"expressie.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "bezig met kopiëren bron hdlist (of synthesis) van \"%s\"..."
+msgid "unknown packages"
+msgstr "onbekende pakketten"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...kopiëren is klaar"
+msgid "unknown package"
+msgstr "onbekend pakket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "niet in staat parallelle optie \"%s\" te gebruiken"
+msgid "removing package %s will break your system"
+msgstr "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"medium \"%s\" gebruikt een ongeldig lijstbestand:\n"
-"  mirror is wellicht niet up-to-date, probeert nu een alternatieve methode"
+msgid "Nothing to remove"
+msgstr "Niets te verwijderen"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "kon het eerste installatiemedium niet vinden"
+msgid "Checking to remove the following packages"
+msgstr "Aanvinken om de volgende pakketten te verwijderen"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "Virtueel medium moet lokaal zijn"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Om aan de afhankelijkheden te voldoen, worden de volgende pakketten "
+"verwijderd (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "registreren van lokale pakketten is mislukt"
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - de download snelheid begrenzen.\n"
+msgid "removing %s"
+msgstr "bezig met verwijderen van %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "afgezochte hdlist (of synthesis) gevonden als %s"
+msgid "Removing failed"
+msgstr "Verwijderen is mislukt"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "ontvangen van bron hdlist (of synthesis) is mislukt"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versie %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "geen rpm bestanden gevonden van [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "er is niets geschreven in het lijstbestand voor \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - alleen de aangegeven media, kommagescheiden.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "De volgende pakketten bevatten een onjuiste handtekening"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "berekenen md5sum van bestaande bron hdlist (of synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - media sorteren afgaand van substrings gescheiden door "
+"komma's.\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - complete uitvoer met te verwijderen pakket.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "kon volgend pakket niet installeren: %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - sta toe de gebruiker te vragen om pakketten te\n"
-"                     installeren zonder afhankelijkheids controle en zonder\n"
-"                     integriteits controle.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "Bestand opslaan"
+"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
+"wordt meegegeven\n"
+"                   lijn, niet compatible met interactieve mode).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - geeft geen identieke regels weer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kon configuratiebestand [%s] niet wegschrijven"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - geeft alle tags weer.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecteer alle pakketten die overeenkomen met de "
-"expressie.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - geeft de tag group weer: groep.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ongeldig sleutel-ID (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - geeft de tag size weer: grootte.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - aanroep forceren zelfs als sommige pakketten niet "
-"bestaan.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - geeft de tag epoch weer: epoch.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "kon de padnaam van verwisselbaar medium \"%s\" niet vinden"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - geeft de tag summary: samenvatting.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - een synthesis bestand proberen te vinden en\n"
-"                      te gebruiken.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - geeft de tag description: omschrijving.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - geeft de tag sourcerpm: broncode rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --forceer-key  - forceer bijwerken van de gpg sleutel.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - geeft de tag packager: pakketsamensteller.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<bijbehorend pad van hdlist> ontbreekt\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - geeft de tag buildhost: 'bouwcomputer'.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Aanvinken om de volgende pakketten te verwijderen"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - geeft de tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "ongevraagd"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - geeft de tag provides: alle 'levert's.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kon rpm-bestand [%s] niet benaderen"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - geeft de tag requires: alle vereisten\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - geeft de tag files: alle bestanden.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "niet in staat \"%s\" te interpreteren in bestand [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Wilt u doorgaan met de installatie ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - geeft de tag conflicts: alle conflicten.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kon rpm bestand [%s] niet lezen van medium \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - geeft de tag obsoletes: alle verouderden\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - urpmi dynamisch configureren vanuit een distrib-boom,\n"
-"                   handig om een chroot te instaleren met de --root optie.\n"
+"  --env          - specifieke omgeving gebruiken (meestal\n"
+"                   een foutrapport).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "hdlist synthesis bestand opgebouwd voor medium \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
+"negeren.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - nuttige informatie afdrukken in leesbare vorm.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - aangegeven distributieversie gebruiken, standaardwaarde\n"
-"                   wordt gehaald uit het geïnstalleerde mandrake-release\n"
-"                   pakket.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - gebruik aangegeven url voor lijst van mirrors, de "
-"standaard\n"
-"                   is %s\n"
+"  -a             - binaire AND operator, waar als beide expressies waar "
+"zijn.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom, handig\n"
-"                   om een chroot te (de)installeren met de --root optie.\n"
+"  -o             - binaire OR operator, waar als een expressie waar is.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, waar als expressie onwaar is.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - linker haakje om groepexpressie te openen.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - rechter haakje om groepexpressie te sluiten.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
-"verwijder hem"
+"Terugbellen is :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s afkoppelen..."
+msgid "using specific environment on %s\n"
+msgstr "maakt gebruik van aangegeven omgeving op %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% voltooid, snelheid = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versie %s\n"
+"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder te voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi herstarten"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "bezig met onderzoeken van het synthesis bestand [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatisch pakketten selecteren voor "
+"systeemopwaardering.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Installatie trachten te forceren (--force)? (j/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - vraag nooit om de-installatie van een pakket, stop de "
+"installatie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiëren mislukt"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - behoud bestaande pakketten wanneer dit mogelijk is, "
+"negeer gevraagde\n"
+"                   pakketten die tot verwijderen nopen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kon hdlist bestand \"%s\" niet benaderen, medium genegeerd"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - splitsen in kleinere transacties wanneer meer dan het\n"
+"                   aangegeven aantal pakketten worden geïnstalleerd of\n"
+"                   opgewaardeerd, standaard is %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - stille modus.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr " --split-length - korte transactielengte, standaard is %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr " --fuzzy        - onprecies zoeken gebruiken (zelfde als -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - geef alle bronpakketten voor het downloaden (alleen root "
-"mag dit).\n"
+"  --src          - volgende pakket is een bronpakket (zelfde als -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - haal de headers voor het opgegeven pakket uit de urpmi\n"
-"                  database, en stuur ze naar de standaarduitvoer (alleen "
-"root)\n"
+"  --install-src  - installeer alleen bronpakketten (geen uitvoerbare "
+"bestanden)\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "onbekende pakketten"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "selecteren van meerdere media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - houd niet gebruikte rpms in cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - sta toe de gebruiker te vragen om pakketten te\n"
+"                    installeren zonder afhankelijkhedencontrole.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "bestand [%s] reeds gebruik in hetzelfde medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - sta toe de gebruiker te vragen om pakketten te\n"
+"                     installeren zonder afhankelijkheids controle en zonder\n"
+"                     integriteits controle.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "niets te verwijderen (gebruik urpmi.addmedia om media toe te voegen)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpmi dynamisch configureren vanuit een distrib-boom,\n"
+"                   handig om een chroot te instaleren met de --root optie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kan het lijstbestand voor \"%s\" niet vinden, medium genegeerd"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - wget gebruiken om bestanden op afstand te ontvangen.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - geeft deze hulptekst.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - gebruik curl om bestanden op afstand te ontvangen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "parallelle handler gevonden voor knooppunten: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - de download snelheid begrenzen.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"Terugbellen is :\n"
-"%s\n"
+"  --resume       -laden hervatten van gedeeltelijk geladen bestand \n"
+"                   (--no-resume schakelt dit uit, standaard uitgeschakeld).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omgekeerde zoekactie voor wat het pakket vereist.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - gebruik specifieke HTTP proxy, het standaard poort "
+"nummer\n"
+"                    is 1080 (formaat is <proxyhost[:poort]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versie %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+"  --proxy-user   - specificeer gebruikersnaam en wachtwoord voor proxy-\n"
+"                    aanmelding (formaat is <gebruiker:wachtwoord>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - geeft de tag-naam niet weer (standaard als er geen tag "
-"wordt meegegeven\n"
-"                   lijn, niet compatible met interactieve mode).\n"
+"  --bug          - schrijf een foutrapport naar de map aangegeven\n"
+"                   door het volgende argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - geeft geen identieke regels weer.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - gebruik een grafische interface.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis kan niet gebruikt worden met --media, --excludemedia, --"
-"sortmedia, --update of --parallel"
+"  --best-output  - gebruik de beste interface afhankelijk van de omgeving:\n"
+"                   grafische of tekst modus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - gebruik aangegeven architectuur, standaard is de versie\n"
-"                   van het geïnstalleerde mandrake-release pakket.\n"
+"  --verify-rpm   - rpm-handtekening verifiëren vóór installatie.\n"
+"                   (--no-verify-rpm schakelt dit uit, standaard "
+"ingeschakeld).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Is dit goed?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - pad (gescheiden door komma) uitsluiten.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - doc bestanden niet meerekenen.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - selecteer alle resultaten van console.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "bezig met onderzoeken parallelle handler in bestand [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - staat zoeken toe in 'levert' om een pakket te vinden.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Niets te verwijderen"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - niet in 'provides' zoeken om een pakket te vinden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - onprecies zoeken gebruiken (zelfde als --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "bezig met lezen van headers van medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - volgend pakket is een bronpakket (zelfde als --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d             - de zoekopdracht uitbreiden om aan afhankelijkheden van\n"
-"                    pakketten te voldoen.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - schrijf een foutrapport naar de map aangegeven\n"
-"                   door het volgende argument.\n"
+"  namen of rpm bestanden gegeven via opdrachtregel worden geïnstalleerd.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medium \"%s\" bevat geen locatie voor rpm bestanden"
+msgid "Choose location to save file"
+msgstr "Kies map om bestand in op te slaan"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - geeft de tag sourcerpm: broncode rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Wat er gebeurt met uitvoerbare rpm bestanden bij --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kon lijstbestand van \"%s\" niet schrijven"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"U heeft een bron-bestand uitgekozen:\n"
+"\n"
+"%s\n"
+"\n"
+"U wilt dit waarschijnlijk niet op uw computer installeren (installatie \n"
+"biedt de mogelijkheid de broncode te wijzigen en vervolgens te compileren).\n"
+"\n"
+"Wat wilt u doen?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - geeft de tag requires: alle vereisten\n"
+msgid "Do nothing"
+msgstr "Niets doen"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "probeert een onbestaand medium \"%s\" te selecteren"
+msgid "Yes, really install it"
+msgstr "Doorgaan met installatie"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - geeft de tag description: omschrijving.\n"
+msgid "Save file"
+msgstr "Bestand opslaan"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiëren mislukt"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"U staat op het punt het volgende softwarepakket op uw computer te "
+"installeren:\n"
+"\n"
+"%s\n"
+"\n"
+"Mogelijk geeft u er de voorkeur aan het bestand slechts op te slaan. Wat is "
+"uw keuze?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - aanmaak van hdlist bestanden forceren.\n"
+msgid "Install it"
+msgstr "Pakket installeren"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"De map [%s] bestaat reeds, gebruik een andere map voor het foutrapport of "
+"verwijder hem"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "geen hdlist-bestand gevonden voor medium \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kon directory [%s] niet aanmaken voor programmafoutrapport"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - volgend pakket is een bronpakket (zelfde als --src).\n"
+msgid "Copying failed"
+msgstr "Kopiëren mislukt"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "bezig met installeren van %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Alleen de beheerder mag pakketten installeren"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "bezig met lezen van rpm-bestanden van [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Wat is uw keuze? (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selecteer automatisch een pakket uit de keuzes.\n"
+msgid "Package installation..."
+msgstr "Pakket-installatie..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Verwijderen is mislukt"
+msgid "Initializing..."
+msgstr "Initialiseren..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - maakt virtueel medium aan dat altijd bijgewerkt is,\n"
-"                   alleen file:// protocol is toegestaan.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "pakket %s is niet gevonden."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "bezig met verwijderen van medium \"%s\""
+"Bepaalde gevraagde pakketten konden niet worden geïnstalleerd:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "niet nodig om <relatief pad van hdlist> te geven met --distrib"
+msgid "do you agree ?"
+msgstr "Bent u het daarmee eens?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Annuleren"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"De volgende pakketten moeten worden verwijderd om andere te kunnen "
+"opwaarderen:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - volgende pakket is een bronpakket (zelfde als -s).\n"
+"De volgende pakketten moeten worden verwijderd om andere te kunnen "
+"opwaarderen:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - specifieke omgeving gebruiken (meestal\n"
-"                   een foutrapport).\n"
+"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
+"geïnstalleerd (%d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - media sorteren afgaand van substrings gescheiden door "
-"komma's.\n"
+"U dient root te zijn om de volgende afhankelijkheden te installeren:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kon medium \"%s\" niet benaderen"
+msgid "unable to get source packages, aborting"
+msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kon medium \"%s\" niet maken\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - geeft de tag packager: pakketsamensteller.\n"
+msgid "Press Enter when ready..."
+msgstr "Druk op Enter wanneer u klaar bent..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dump de configuratie in de vorm van een urpmi.addmedia "
-"formaat.\n"
+msgid "Downloading package `%s'..."
+msgstr "Bezig met downloaden van pakket `%s'..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% voltooid, snelheid = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De volgende pakketten bevatten een onjuiste handtekening"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Wilt u doorgaan met de installatie ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"U dient root te zijn om de volgende afhankelijkheden te installeren:\n"
+"Installatie is mislukt, sommige bestanden missen:\n"
 "%s\n"
+"Misschien moet u de urpmi database opwaarderen"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - geeft veranderingen-logboek weer.\n"
+msgid "Installation failed"
+msgstr "Installatie mislukt"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kon list bestand van \"%s\" niet benaderen, medium genegeerd"
+msgid "distributing %s"
+msgstr "bezig met distribueren van %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - rechter haakje om groepexpressie te sluiten.\n"
+msgid "installing %s"
+msgstr "bezig met installeren van %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "geen ``webfetch'' gevonden, ondersteund zijn: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "bezig met onderzoeken hdlist bestand [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr ""
+"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "bezig met kopiëren hdlist bestanden"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Installatie trachten te forceren (--force)? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "bezig met schrijven van lijstbestand voor medium \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d installatie-transacties mislukt"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Virtueel medium \"%s\" moet een leeg url hebben, medium genegeerd"
+msgid "Installation is possible"
+msgstr "Installatie is mogelijk"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - geeft de tag buildhost: 'bouwcomputer'.\n"
+msgid "Everything already installed"
+msgstr "Alles is al geïnstalleerd"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Niets doen"
+msgid "restarting urpmi"
+msgstr "urpmi herstarten"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"gebruik: urpmi.addmedia [opties] <naam> <url> [with <relatief_pad>]\n"
+"waar <url> één van de volgende is:\n"
+"       file://<pad>\n"
+"       ftp://<gebruikersnaam>:<wachtwoord>@<host>/<pad> with <relatieve "
+"bestandsnaam van hdlist>\n"
+"       ftp://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
+"       http://<host>/<pad> with <relatieve bestandsnaam van hdlist>\n"
+"       removable://<pad>\n"
+"\n"
+"en [opties] kunnen zijn:\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "geassocieerde media worden voor parallelle modus gebruikt: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - maak een bijwerkmedium aan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "%s koppelen..."
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - een synthesis bestand proberen te vinden en\n"
+"                      te gebruiken.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
-"kon medium \"%s\" niet verzorgen, omdat het list bestand al in gebruik is "
-"door een ander medium"
+"  --probe-hdlist - probeer een hdlist bestand te vinden en te gebruiken.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     -  probeer geen synthesis of hdlist bestand te\n"
+"                   vinden.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  --root         - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
+"  --distrib      - maakt automatisch alle media van een installatiemedium\n"
+"                    aan.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% van %s voltooid, ETA = %s, snelheid = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - maak automatisch een medium aan voor het XXX gedeelte "
+"van\n"
+"                   een distributie, XXX kan main, contrib, updates (of iets "
+"anders dat\n"
+"                   geconfigureerd is) zijn.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "berekenen md5sum van ontvangen bron hdlist (of synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - gebruik aangegeven url voor lijst van mirrors, de "
+"standaard\n"
+"                   is %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - aangegeven distributieversie gebruiken, standaardwaarde\n"
+"                   wordt gehaald uit het geïnstalleerde mandrake-release\n"
+"                   pakket.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - vraag nooit om de-installatie van een pakket, stop de "
-"installatie.\n"
+"  --arch         - gebruik aangegeven architectuur, standaard is de versie\n"
+"                   van het geïnstalleerde mandrake-release pakket.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq versie %s\n"
-"Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
+"  --virtual      - maakt virtueel medium aan dat altijd bijgewerkt is,\n"
+"                   alleen file:// protocol is toegestaan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "bezig met bron hdlist (of synthesis) van \"%s\" te ontvangen..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  -geen-md5som  - MD5SUM bestandscontrole uitschakelen.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - toont de groepen ook met namen.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - buffermap headers wissen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medium \"%s\" is niet geselecteerd"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - aanmaak van hdlist bestanden forceren.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Alleen de beheerder mag pakketten installeren"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan geen updates van een cooker distributie toevoegen\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "maakt gebruik van aangegeven omgeving op %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "ontvangen van mirrors op %s..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kon hdlist bestand voor \"%s\" niet vinden, medium genegeerd"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "niet nodig om <relatief pad van hdlist> te geven met --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - korte transactielengte, standaard is %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kon medium \"%s\" niet bijwerken\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - linker haakje om groepexpressie te openen.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<bijbehorend pad van hdlist> ontbreekt\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "teveel koppelpunten voor verwisselbaar medium \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' ontbreekt voor netwerkmedia\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binaire AND operator, waar als beide expressies waar "
-"zijn.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kon medium \"%s\" niet maken\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"kan geen toegang tot medium \"%s\" verkrijgen,\n"
-"dit kan gebeuren wanneer u de map handmatig heeft gekoppeld bij het aanmaken "
-"van het medium."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - geeft de tag group weer: groep.\n"
+"gebruik: urpmi.removemedia [-a] <naam> ...\n"
+"waar <naam> is een medium naam die verwijderd moet worden.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - alleen de aangegeven media, kommagescheiden.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - alle media selecteren.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "Niet in staat om transactie aan te maken."
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"onbekende opties '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "bezig met ontvangen van rpm bestanden van medium \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "niets te verwijderen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"U heeft een bron-bestand uitgekozen:\n"
-"\n"
-"%s\n"
-"\n"
-"U wilt dit waarschijnlijk niet op uw computer installeren (installatie \n"
-"biedt de mogelijkheid de broncode te wijzigen en vervolgens te compileren).\n"
-"\n"
-"Wat wilt u doen?"
+"het te verwijderen item ontbreekt\n"
+"(één van %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "bezig met distribueren van %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"gebruik: urpmi.update [opties] <naam> ...\n"
+"waar <naam> een mediumnaam is die bijgewerkt moet worden.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - vernieuw alleen bijwerkmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "config-bestand [%s] wegschrijven"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --forceer-key  - forceer bijwerken van de gpg sleutel.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecteer alle niet-verwisselbare media.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - geeft de tag epoch weer: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - rpm-handtekening verifiëren vóór installatie.\n"
-"                   (--no-verify-rpm schakelt dit uit, standaard "
-"ingeschakeld).\n"
+"de invoer om op te waarderen ontbreekt\n"
+"(één van %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versie %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list          - geeft alle beschikbare pakketten weer\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - maak een bijwerkmedium aan.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - beschikbare media opsommen.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - beschikbare media en hun url opsommen.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - onprecies zoeken gebruiken (zelfde als --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dump de configuratie in de vorm van een urpmi.addmedia "
+"formaat.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "ongeldige hdlist omschrijving \"%s\" in hdlists bestand"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - beschikbare knooppunten opsommen bij --parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "bezig met verwijderen van %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - beschikbare parallelle aliasen opsommen.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - maak automatisch een medium aan voor het XXX gedeelte "
-"van\n"
-"                   een distributie, XXX kan main, contrib, updates (of iets "
-"anders dat\n"
-"                   geconfigureerd is) zijn.\n"
+"  --headers      - haal de headers voor het opgegeven pakket uit de urpmi\n"
+"                  database, en stuur ze naar de standaarduitvoer (alleen "
+"root)\n"
 
-#: ../urpmf:1
+#: ../urpmq:62
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - geeft de tag size weer: grootte.\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - geef alle bronpakketten voor het downloaden (alleen root "
+"mag dit).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:65
 #, c-format
-msgid "in order to keep %s"
-msgstr "Om %s te behouden"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - urpmi dynamisch configureren vanuit distrib-boom.\n"
+"                   Hiermee kunt u de distro bevragen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "vanwege onvoldane %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - geeft veranderingen-logboek weer.\n"
 
-#: ../_irpm:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"Automatische installatie van pakketten...\n"
-"U vroeg de installatie van pakket %s aan\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi database geblokkeerd"
+"  -d             - de zoekopdracht uitbreiden om aan afhankelijkheden van\n"
+"                    pakketten te voldoen.\n"
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --resume       -laden hervatten van gedeeltelijk geladen bestand \n"
-"                   (--no-resume schakelt dit uit, standaard uitgeschakeld).\n"
+"  -u             - verwijder pakket als een recentere versie al is "
+"geïnstalleerd.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - complete uitvoer met te verwijderen pakket.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  -geen-md5som  - MD5SUM bestandscontrole uitschakelen.\n"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omgekeerde zoekactie voor wat het pakket vereist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "gebruikt verwisselbare schijf als \"%s\""
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - nuttige informatie afdrukken in leesbare vorm.\n"
 
-#: ../urpmi:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"U staat op het punt het volgende softwarepakket op uw computer te "
-"installeren:\n"
-"\n"
-"%s\n"
-"\n"
-"Mogelijk geeft u er de voorkeur aan het bestand slechts op te slaan. Wat is "
-"uw keuze?"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - toont de groepen ook met namen.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr " --fuzzy        - onprecies zoeken gebruiken (zelfde als -y).\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - geeft de versie en release samen met de naam.\n"
 
-#: ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - verwijder pakket als een recentere versie al is "
-"geïnstalleerd.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - geeft alle bestanden in pakket weer\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:90
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  --probe-hdlist - probeer een hdlist bestand te vinden en te gebruiken.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "due to missing %s"
-msgstr "vanwege missende %s"
+"  namen van rpm bestanden opgegeven via console zijn in de wachtrij "
+"geplaatst\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan alleen worden gebruikt met --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"gebruik: urpmi.update [opties] <naam> ...\n"
-"waar <naam> een mediumnaam is die bijgewerkt moet worden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "bezig met proberen bestaand medium \"%s\" te omzeilen"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - verifiëren dat de installatie correct uitgevoerd kan "
-"worden.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Eén van de volgende pakketten is benodigd om te installeren: %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versie %s\n"
+#~ "Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+#~ "GNU GPL.\n"
+#~ "\n"
+#~ "gebruik:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Onbekende webfetch `%s' !!!\n"
diff --git a/po/nn.po b/po/nn.po
index 2a9952f1..4081b402 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-28 18:30+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -35,861 +35,777 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "Installerer %s.\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      – Lag automatisk alle medium frå\n"
-"                   eit installasjonsmedium.\n"
+"Automatisk pakkeinstallering ...\n"
+"Du har bedt om installering av pakken %s.\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "Klarte ikkje opna «rpmdb»."
+msgid "Is this OK?"
+msgstr "Er dette greitt?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         – Vis denne hjelpeteksten.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Du treng éin av desse pakkane for å installera «%s»:"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "Fjernar pakken «%s»."
+msgid " (Y/n) "
+msgstr " (J/N) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "«%s»."
+msgid "%s: command not found\n"
+msgstr "%s: Fann ikkje kommandoen.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kan ikkje bruka parallellmodus i «use-distrib»-modus."
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"Bruk: %s [val]\n"
+"der [val] er av:\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Alt er allereie installert."
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      – Vis denne hjelpeteksten.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             – Tøm hovudlinjemellomlageret.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --g[roup]      – Vis merkelappen «group»: gruppe.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "Brukar prosessen «%d» for transaksjon."
+msgid "                    defaults is %s.\n"
+msgstr "                    Standardverdi: %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     – Vis merkelappen «provides»: alle tilbod.\n"
+msgid "unknown protocol defined for %s"
+msgstr "Ukjend protokoll definert for «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kven av dei vil du ha? (1–%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "Fann ingen «webfetch». Støtta «webfetch»-ar er: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "Fann %d hovudlinjer i mellomlageret."
+msgid "unable to handle protocol: %s"
+msgstr "Kan ikkje bruka protokollen: %s."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "Det finst fleire pakkar med same rpm-filnamn «%s»."
+msgid "syntax error in config file at line %s"
+msgstr "Syntaksfeil i oppsettfila på linje %s."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   – Vel brukar og passord for mellomtenar-\n"
-"                   autentisering. (Format: <brukar:passord>.)\n"
+"Mediet «%s» prøver å bruka ei allereie brukt «hdlist»-fil. Hoppar over "
+"mediet."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "Går gjennom på nytt for å rekna ut avhengnader.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Mottek rpm-fil [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"Kan ikkje bruka mediet «%s», då «list»-fila allereie er brukt av eit anna "
+"medium."
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "Namnet «%s» er allereie opptatt."
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "... ikkje motteken: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "Kan ikkje bruka mediet «%s», då det ikkje finst noko «list»-fil [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "Klarte ikkje lesa «list»-fil for «%s». Hoppar over mediet."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "Klarte ikkje finna mediet til denne «hdlist»-fila [%s]."
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             – Binær ELLER-operator. Sann viss minst eitt av uttrykka er "
-"sanne.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "Klarte ikkje opna «hdlist»-fila til «%s». Hoppar over mediet."
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Installerer pakke ..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "Klarte ikkje opna «list»-fila til «%s». Hoppar over mediet."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Ugyldig rpm-filnamn [%s]."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "Prøver å hoppa over eksisterande medium «%s». Unngår"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"Det virtuellet mediet «%s» kan ikkje ha definert noko «hdlist»- eller «list»-"
+"fil. Hoppar over mediet."
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d mislykka installasjonstransaksjon."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"Klarte ikkje lesa frå første installasjonsmedium (fann inga Mandrake/base/"
-"hdlists-fil)."
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "Fann ikkje noko «hdlist»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Dårleg val. Prøv på nytt.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "Fann ikkje noko «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Vel plassering av lagra fil."
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Øydelagt «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      – Vis merkelappen «summary»: samandrag.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "Klarte ikkje lesa «list»-fil for «%s». Hoppar over mediet."
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Desse pakkane inneheld «%s»: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Installer han."
+msgid "taking removable device as \"%s\""
+msgstr "Brukar flyttbar eining som «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            – Bruk X-grensesnitt.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Du treng éin av desse pakkane:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Fann ikkje adresse til det flyttbare mediet «%s»."
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "På grunn av avhengnader blir desse pakkane fjerna (%d MiB)"
+msgid "unable to write config file [%s]"
+msgstr "Klarte ikkje skriva oppsettfila [%s]."
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  – Vel automatisk det beste grensesnittet etter\n"
-"                   miljø: X eller tekstmodus.\n"
+msgid "write config file [%s]"
+msgstr "Skriv oppsettfil [%s]."
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Lastar ned pakken «%s» ..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kan ikkje bruka parallellmodus i «use-distrib»-modus."
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Kva som kan gjerast med binær-rpm-filer med «--install-src»"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Klarte ikkje tolka «%s» i fila [%s]."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  – Vel automatisk alle pakkar som kan oppdaterast.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "Undersøkjer parallellhandtering i fila [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "Det finst ingen «%s»-pakke."
+msgid "found parallel handler for nodes: %s"
+msgstr "Fann parallellhandtering for nodar: %s."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             – Vel alle treff på kommandolinja.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "Brukar tilknytta medium for parallellmodus: %s."
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Feil ved installering. Nokre filer manglar:\n"
-"%s\n"
-"Du bør oppdatera urpmi-databasen."
+msgid "unable to use parallel option \"%s\""
+msgstr "Klarte ikkje bruka parallellvalet «%s»."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Bruk: urpmi.removemedia [-a] <namn> ...\n"
-"der <namn> er namnet på mediet som skal fjernast.\n"
+"Kan ikkje bruka «--synthesis» saman med «--media», «--excludemedia», «--"
+"sortmedia», «--update» eller «--parallel»."
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Kan ikkje halda fram å installera, då desse pakkane først må fjernast\n"
-"for at andre skal kunna oppdaterast:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "Les syntesefila [%s]."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "Manglar «with» for nettverksmedium.\n"
+msgid "examining hdlist file [%s]"
+msgstr "Les «hdlist»-fila [%s]."
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             – Vis oversikt over filer i pakken.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "Det virtuelle mediet «%s» er ikkje lokalt. Hoppar over mediet."
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "Ukjend pakke"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Feil ved lesing av «hdlist» eller syntesefila til mediet «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Det går an å installera."
+msgid "performing second pass to compute dependencies\n"
+msgstr "Går gjennom på nytt for å rekna ut avhengnader.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "Hoppar over pakken «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Grunna avhengnader blir desse %d pakkane installerte (%d MiB)"
+msgid "would install instead of upgrade package %s"
+msgstr "Ville installert i staden for å oppgradera pakken «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "Kan ikkje bruka mediet «%s», då det ikkje finst noko «list»-fil [%s]."
+msgid "unable to open rpmdb"
+msgstr "Klarte ikkje opna «rpmdb»."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (J/N) "
+msgid "medium \"%s\" already exists"
+msgstr "Mediet «%s» finst allereie."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "Kan ikkje leggja til oppdateringar til «cooker»-distribusjonar.\n"
+msgid "virtual medium need to be local"
+msgstr "Det virtuelle mediet må vera lokalt."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             – Utvida meldingar.\n"
+msgid "added medium %s"
+msgstr "La til mediet «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Gjer klar ..."
+msgid "unable to access first installation medium"
+msgstr "Klarte ikkje lesa frå første installasjonsmedium."
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         – Vis oversikt over tilgjengelege pakkar.\n"
+msgid "copying hdlists file..."
+msgstr "Kopierer «hdlist»-fil ..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          – Vis alle merkelappar.\n"
+msgid "...copying failed"
+msgstr "... mislukka kopiering."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
+msgid "...copying done"
+msgstr "... kopiering fullført."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"Det virtuellet mediet «%s» kan ikkje ha definert noko «hdlist»- eller «list»-"
-"fil. Hoppar over mediet."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "Reknar ut md5sum av kopier kjelde-«hdlist» (eller syntese)."
+"Klarte ikkje lesa frå første installasjonsmedium (fann inga Mandrake/base/"
+"hdlists-fil)."
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  – Hopp over stig (kommadelt liste).\n"
+msgid "retrieving hdlists file..."
+msgstr "Mottek «hdlists»-fil ..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Trykk så «Enter» ..."
+msgid "...retrieving done"
+msgstr "... ferdig motteken."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Ukjende val: «%s».\n"
+msgid "...retrieving failed: %s"
+msgstr "... ikkje motteken: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  – Del opp i fleire transaksjonar viss fleire enn valt tal "
-"på\n"
-"                   pakkar skal installerast eller oppdaterast. "
-"Standardverdi: %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "Ugyldig «hdlist»-beskriving («%s») i «hdlists»-fila."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "Feil ved lesing av «hdlist» eller syntesefila til mediet «%s»."
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "Prøver å velja ikkjeeksisterande medium «%s»."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         – Bruk wget til å henta fjerntliggjande filer.\n"
+msgid "selecting multiple media: %s"
+msgstr "Vel fleire medium: %s."
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             – Tillèt søk i tilbod for å finna pakkar.\n"
+msgid "\"%s\""
+msgstr "«%s»."
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   – Vis tilgjengelege nodar ved bruk av «--parallel».\n"
+msgid "removing medium \"%s\""
+msgstr "Fjernar mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "Byggjer «hdlist» [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"Fekk ikkje tilgang til mediet «%s».\n"
+"Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         – Behald eksisterande pakkar viss mogleg. Ikkje installer\n"
-"                   pakkar som krev fjerning av andre pakkar.\n"
+"Det virtuelle mediet «%s» må ha ei gyldig kjelde-«hdlist» eller -syntese. "
+"Hoppar over mediet."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "Kontrollerer md5sum."
+msgid "copying description file of \"%s\"..."
+msgstr "Kopierer beskrivingsfila til «%s» ..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: Fann ikkje kommandoen.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "Reknar ut md5sum av gammal kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "Klarte ikkje registrera rpm-fil."
+msgid "examining MD5SUM file"
+msgstr "Kontrollerer md5sum."
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps – Tillèt å spørja brukarar å installera pakkar\n"
-"                   utan sjekking av avhengnader.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "Kopierer kjelde-«hdlist» (eller syntese) til «%s» ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Kan ikkje bruka protokollen: %s."
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "Mottek «hdlists»-fil ..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "Reknar ut md5sum av kopier kjelde-«hdlist» (eller syntese)."
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ja, installer pakken."
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "Mislykka kopiering av [%s] (md5summen stemmer ikkje)."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "La til mediet «%s»."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Feil ved lesing av syntesefil til mediet «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      – Behald ikkje-brukte rpm-filer i mellomlager.\n"
+msgid "reading rpm files from [%s]"
+msgstr "Leser rpm-filer frå [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
-"upgrade: %d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "Klarte ikkje lesa rpm-filer frå [%s]: %s."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5summen stemmer ikkje."
+msgid "no rpm files found from [%s]"
+msgstr "Fann ingen rpm-filer frå [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Syntaksfeil i oppsettfila på linje %s."
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Mottek kjelde-«hdlist» (eller syntese) til «%s» ..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  Namn og rpm-filer valt på kommandolinja blir installerte.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "Fann undersøkt «hdlist» (eller syntese) som «%s»."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        – Bruk valt HTTP-mellomtenar. Standard portnummer: 1080.\n"
-"                   (Format: <tenarnamn[:port]>.)\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "Reknar ut md5sum til motteken kjelde-«hdlist» (eller syntese)."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "for å kunna installera «%s»"
+msgid "md5sum mismatch"
+msgstr "md5summen stemmer ikkje."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "Flytta om %s oppføringar i avhengnadslista."
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "Klarte ikkje henta kjelde-«hdlist» (eller syntese)."
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             – Ikkje skil mellom store og små bokstavar.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Fann inga «hdlist»-fil for mediet «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Klarte ikkje laga mappe [%s] for feilrapport."
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "Fila [%s] er allereie brukt i same mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "Ville installert i staden for å oppgradera pakken «%s»."
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "Klarte ikkje tolka «hdlist»-fila til «%s»."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "Mottek spegelliste frå «%s» ..."
+msgid "unable to write list file of \"%s\""
+msgstr "Klarte ikkje skriva «list»-fila til «%s»."
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          – Vis merkelappen «url»: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "Lagrar listefil for mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "Ukjend protokoll definert for «%s»."
+msgid "nothing written in list file for \"%s\""
+msgstr "Skreiv ingenting i listafila til «%s»."
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             – Vis òg versjonsinformasjon med namnet.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "Les offentlegnøkkelfila til «%s» ..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    – Vis merkelappen «obsoletes»: alle erstattingar.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "Mediet «%s» finst allereie."
+msgid "unable to import pubkey file of \"%s\""
+msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "Installerer %s.\n"
+msgid "reading headers from medium \"%s\""
+msgstr "Les mediumhovud til mediet «%s»."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Manglar oppføringa som skal oppdaterast\n"
-"(éin av %s)\n"
+msgid "building hdlist [%s]"
+msgstr "Byggjer «hdlist» [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "Prøver å prioritera «%s»"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Fullført bygging av «hdlist»-syntesefil for mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "Klarte ikkje fjerna pakken «%s»"
+msgid "found %d headers in cache"
+msgstr "Fann %d hovudlinjer i mellomlageret."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Feil ved lesing av syntesefil til mediet «%s»."
+msgid "removing %d obsolete headers in cache"
+msgstr "Fjernar %d utdaterte hovudlinjer frå mellomlageret."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Manglar oppføringa som skal fjernast.\n"
-"(Skal vera ein av: %s.)\n"
+msgid "mounting %s"
+msgstr "Monterer «%s»."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             – Vel alle medium.\n"
+msgid "unmounting %s"
+msgstr "Avmonterer «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Manglar signatur (%s)."
+msgid "relocated %s entries in depslist"
+msgstr "Flytta om %s oppføringar i avhengnadslista."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "Klarte ikkje lesa rpm-filer frå [%s]: %s."
+msgid "no entries relocated in depslist"
+msgstr "Flytta ikkje om nokon oppføringar i avhengnadslista."
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     – Distribuert urpmi over maskiner med alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "Ugyldig rpm-filnamn [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
+msgid "retrieving rpm file [%s] ..."
+msgstr "Mottek rpm-fil [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       – Berre oppdater oppdateringsmedium.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "Klarte ikkje lesa rpm-fil [%s]."
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/N) "
+msgid "unable to register rpm file"
+msgstr "Klarte ikkje registrera rpm-fil."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --g[roup]      – Vis merkelappen «group»: gruppe.\n"
+msgid "error registering local packages"
+msgstr "Klarte ikkje registrera lokale pakkar."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
+msgid "no package named %s"
+msgstr "Det finst ingen «%s»-pakke."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "Ugyldig inndata: [%s]."
+msgid "The following packages contain %s: %s"
+msgstr "Desse pakkane inneheld «%s»: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "Du vil øydeleggja systemet viss du fjernar pakken «%s»."
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Det finst fleire pakkar med same rpm-filnamn «%s»."
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   – Vis oversikt over tilgjengelege medium.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "Klarte ikkje tolka [%s] på verdien «%s»."
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Nokon av pakkane kan ikkje installerast:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerer pakken «%s» (%s/%s) ..."
+"Mediet «%s» brukar ei ugyldig «list»-fil:\n"
+"Spegelen er truleg ikkje oppdatert. Prøver å bruka ein alternativ metode."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "Flytta ikkje om nokon oppføringar i avhengnadslista."
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "Mediet «%s» har ikkje adresseinformasjon for rpm-filer."
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  – Berre installer kjeldepakkar.\n"
+msgid "package %s is not found."
+msgstr "Fann ikkje pakken «%s»."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         – Bruk curl til å henta fjerntliggjande filer.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-databasen er låst."
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
+msgid "medium \"%s\" is not selected"
+msgstr "Mediet «%s» er ikkje valt."
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "OK?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "Klarte ikkje lesa rpm-fil [%s] frå mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Øydelagt «list»-fil for «%s». Hoppar over mediet."
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "... ferdig motteken."
+msgid "unable to access medium \"%s\""
+msgstr "Klarte ikkje lesa mediet «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "Legg til pakken «%s» (id: %d – eid: %d – update: %d – file: %s)."
+msgid "malformed input: [%s]"
+msgstr "Ugyldig inndata: [%s]."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "Hoppar over pakken «%s»."
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Mottek rpm-filer frå mediet «%s» ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ugyldig signatur (%s)."
+msgid "Preparing..."
+msgstr "Førebur ... "
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  namn og rpm-filer gitt på kommandolinja blir førespurd.\n"
+msgid "using process %d for executing transaction"
+msgstr "Brukar prosessen «%d» for transaksjon."
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi – versjon %s\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "Klarte ikkje tolka [%s] på verdien «%s»."
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "Klarte ikkje finna mediet til denne «hdlist»-fila [%s]."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "Klarte ikkje tolka «hdlist»-fila til «%s»."
+"Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
+"upgrade: %d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"Mediet «%s» prøver å bruka ei allereie brukt «hdlist»-fil. Hoppar over "
-"mediet."
+msgid "unable to create transaction"
+msgstr "Klarte ikkje laga transaksjon."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "på grunn av konfliktar med «%s»"
+msgid "removing package %s"
+msgstr "Fjernar pakken «%s»."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Fjernar %d utdaterte hovudlinjer frå mellomlageret."
+msgid "unable to remove package %s"
+msgstr "Klarte ikkje fjerna pakken «%s»"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "Klarte ikkje oppdatera mediet «%s».\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "Legg til pakken «%s» (id: %d – eid: %d – update: %d – file: %s)."
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
+msgid "unable to install package %s"
+msgstr "Klarte ikkje installera pakken «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "Det virtuelle mediet «%s» er ikkje lokalt. Hoppar over mediet."
+msgid "due to missing %s"
+msgstr "då «%s» manglar"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Førebur ... "
+msgid "due to unsatisfied %s"
+msgstr "då «%s» ikkje er tilfredsstilt"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    Standardverdi: %s.\n"
+msgid "trying to promote %s"
+msgstr "Prøver å prioritera «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
+msgid "in order to keep %s"
+msgstr "for å kunna behalda «%s»"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     – Ikkje prøv å finna syntese eller «hdlist»-fil.\n"
+msgid "in order to install %s"
+msgstr "for å kunna installera «%s»"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             – Ikkje søk i tilbod for å finna pakkar.\n"
+msgid "due to conflicts with %s"
+msgstr "på grunn av konfliktar med «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "Mislykka kopiering av [%s] (md5summen stemmer ikkje)."
+msgid "unrequested"
+msgstr "ikkje etterspurd"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  – Set opp urpmi direkte frå eit distribusjonstre.\n"
-"                   Med dette kan du gjera spørjingar på ein distribusjon.\n"
+msgid "Invalid signature (%s)"
+msgstr "Ugyldig signatur (%s)."
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"Bruk: %s [val]\n"
-"der [val] er av:\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Ugyldig nøkkel-ID (%s)."
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        – Fjern rpm-filer frå mellomlager først.\n"
+msgid "Missing signature (%s)"
+msgstr "Manglar signatur (%s)."
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "Namnet «%s» er allereie opptatt."
+msgid "bad proxy declaration on command line\n"
+msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    – Vis merkelappen «conflicts»: alle konfliktar.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"Det virtuelle mediet «%s» må ha ei gyldig kjelde-«hdlist» eller -syntese. "
-"Hoppar over mediet."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Dårleg val. Prøv på nytt.\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -906,1087 +822,1217 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         – Vis denne hjelpeteksten.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         – Vel automatisk pakkar ved fleire alternativ.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"Bruk: urpmi.addmedia [val] <namn> <url> [with <relativ_stig>]\n"
-"der <url> er ein av\n"
-"       file://<stig>\n"
-"       ftp://<brukarnamn>:<passord>@<vertsnamn>/<stig> with <relativt "
-"filnamn til «hdlist»>\n"
-"       ftp://<vertsnamn>/<stig> with <relativt filenamn til «hdlist»>\n"
-"       http://<vert>/<stig> with <relativt filenamn til «hdlist»>\n"
-"       removable://<stig>\n"
-"\n"
-"og [val] er av desse:\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         – kontroller at installeringa kan fungera.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "Kopierer kjelde-«hdlist» (eller syntese) til «%s» ..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "... kopiering fullført."
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     – Distribuert urpmi over maskiner med alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "Klarte ikkje bruka parallellvalet «%s»."
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         – Bruka anna rot for rpm-installering.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"Mediet «%s» brukar ei ugyldig «list»-fil:\n"
-"Spegelen er truleg ikkje oppdatert. Prøver å bruka ein alternativ metode."
+"  --use-distrib  – Set opp urpmi direkte frå eit «distrib»-tre.\n"
+"Nyttig for å (av)installera ei «chroot» med «--root»-valet.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "Klarte ikkje lesa frå første installasjonsmedium."
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             – Utvida meldingar.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "Det virtuelle mediet må vera lokalt."
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             – Vel alle pakkar som samsvarer med uttrykket.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "Klarte ikkje registrera lokale pakkar."
+msgid "unknown packages"
+msgstr "Ukjende pakkar"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   – Avgrens nedlastingsfart.\n"
+msgid "unknown package"
+msgstr "Ukjend pakke"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "Fann undersøkt «hdlist» (eller syntese) som «%s»."
+msgid "removing package %s will break your system"
+msgstr "Du vil øydeleggja systemet viss du fjernar pakken «%s»."
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "Klarte ikkje henta kjelde-«hdlist» (eller syntese)."
+msgid "Nothing to remove"
+msgstr "Ingenting å fjerna."
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "Fann ingen rpm-filer frå [%s]."
+msgid "Checking to remove the following packages"
+msgstr "Kontrollerer fjerning av desse pakkane"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Skreiv ingenting i listafila til «%s»."
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "På grunn av avhengnader blir desse pakkane fjerna (%d MiB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Desse pakkane har ugyldige signaturar"
+msgid " (y/N) "
+msgstr " (J/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "Reknar ut md5sum av gammal kjelde-«hdlist» (eller syntese)."
+msgid "removing %s"
+msgstr "Fjernar «%s»."
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "Removing failed"
+msgstr "Klarte ikkje fjerna."
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  -c             – Fullstendig oversikt over pakken som skal fjernast.\n"
+"urpmf – versjon %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "Klarte ikkje installera pakken «%s»"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       – Bruk berre oppdateringsmedium.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        – Bruk berre gitt medium (kommadelt liste).\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  – Tillèt å spørja brukarar å installera pakkar\n"
-"                   utan sjekking av avhengnader og integritet.\n"
+"  --sortmedia    – Sorter medium etter delstrengar (kommadelt liste).\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Lagra fila."
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      – Utvida meldingar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "Klarte ikkje skriva oppsettfila [%s]."
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        – Ikkje vis merkelappnamn. (Standard viss ingen merkelapp\n"
+"valt på kommandolinja. Ikkje kompatibel med interaktiv modus).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             – Vel alle pakkar som samsvarer med uttrykket.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         – Vis ikkje identiske linjer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ugyldig nøkkel-ID (%s)."
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          – Vis alle merkelappar.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        – Vis merkelappen «group»: gruppe.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Fann ikkje adresse til det flyttbare mediet «%s»."
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         – Vis merkelappen «size»: storleik.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis – Prøv å finna og bruka syntesefil.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        – Vis merkelappen «epoch»: epoke.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      – Vis merkelappen «summary»: samandrag.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    – Tving oppdatering av PGP-nøkkel.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  – Vis merkelappen «description»: beskriving.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "Manglar <relativ stig til «hdlist»>.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    – Viss merkelappen «sourcerpm»: kjelde-rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrollerer fjerning av desse pakkane"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     – Vis merkelappen «packager»: pakkar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "ikkje etterspurd"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    – Vis merkelappen «buildhost»: byggjevert.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "Klarte ikkje lesa rpm-fil [%s]."
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          – Vis merkelappen «url»: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        – Vis merkelappen «files»: alle filer.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     – Vis merkelappen «provides»: alle tilbod.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Klarte ikkje tolka «%s» i fila [%s]."
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     – Vis merkelappen «requires«»: alle krav.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vil du halda fram med å installera?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        – Vis merkelappen «files»: alle filer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "Klarte ikkje lesa rpm-fil [%s] frå mediet «%s»."
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    – Vis merkelappen «conflicts»: alle konfliktar.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    – Vis merkelappen «obsoletes»: alle erstattingar.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  – Set opp urpmi direkte frå eit distribusjonstre.\n"
-"                   Nyttig for installering av ei «chroot» med «--root»-"
-"valet.\n"
+"  --env          – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Fullført bygging av «hdlist»-syntesefil for mediet «%s»."
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             – Ikkje skil mellom store og små bokstavar.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             – Vis nyttig informasjon i lettlesbart format.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             – Vis versjon-, utgåve og arkitekturinformasjon.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      – Bruk valt distribusjonsversjon. Versjonen gitt av "
-"installert\n"
-"                   «mandrake-release»-pakke blir brukt som standard.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         – Bruk valt adresse for liste over speglar.\n"
-"                   Standardverdi: %s.\n"
+"  -a             – Binær OG-operator. Sann viss begge uttrykka er sanne.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  – Set opp urpmi direkte frå eit «distrib»-tre.\n"
-"Nyttig for å (av)installera ei «chroot» med «--root»-valet.\n"
+"  -o             – Binær ELLER-operator. Sann viss minst eitt av uttrykka er "
+"sanne.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              – Unær IKKJE-operator. Sann viss og berre viss uttrykket er "
 "usant.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              – Venstreparentes for opna gruppeuttrykk.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              – Høgreparentes for å lukka gruppeuttrykk.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Mappa [%s] finst allerie. Bruk ei anna mappe for feilrapport, eller slett "
-"denne."
+"Tilbakekall:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "Avmonterer «%s»."
+msgid "using specific environment on %s\n"
+msgstr "Brukar eigedefinert miljø på «%s»\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"Det finst ingenting å oppdatera. (Bruk «urpmi.addmedia» til å leggja til "
-"medium.)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% motteken. Fart: %s."
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi – versjon %s\n"
+"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "Startar urpmi på nytt."
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "Les syntesefila [%s]."
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  – Vel automatisk alle pakkar som kan oppdaterast.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall – Be aldri om å avinstallera ein pakke, men avbryt "
+"installeringa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "... mislukka kopiering."
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         – Behald eksisterande pakkar viss mogleg. Ikkje installer\n"
+"                   pakkar som krev fjerning av andre pakkar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "Klarte ikkje opna «hdlist»-fila til «%s». Hoppar over mediet."
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  – Del opp i fleire transaksjonar viss fleire enn valt tal "
+"på\n"
+"                   pakkar skal installerast eller oppdaterast. "
+"Standardverdi: %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             – Stillemodus.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length – Transaksjonslengd: Standardverdi: %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      – Utvida meldingar.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        – Bruk òg ikkje-ordrett søk (same som «-y»).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
-"brukar).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          – Neste pakke er ein kjeldepakke (same som «-s»).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      – Hent ut hovudlinjer for pakken, frå urpmi-databasen\n"
-"til standard-ut (berre for «root»-brukaren).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  – Berre installer kjeldepakkar.\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "Ukjende pakkar"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        – Fjern rpm-filer frå mellomlager først.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Vel fleire medium: %s."
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      – Behald ikkje-brukte rpm-filer i mellomlager.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             – Vis versjon-, utgåve og arkitekturinformasjon.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps – Tillèt å spørja brukarar å installera pakkar\n"
+"                   utan sjekking av avhengnader.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "Fila [%s] er allereie brukt i same mediet «%s»."
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  – Tillèt å spørja brukarar å installera pakkar\n"
+"                   utan sjekking av avhengnader og integritet.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"Det finst ingenting som kan fjernast. (Bruk «urpmi.addmedia» til å leggja "
-"til eit medium.)\n"
+"  --use-distrib  – Set opp urpmi direkte frå eit distribusjonstre.\n"
+"                   Nyttig for installering av ei «chroot» med «--root»-"
+"valet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "Fann ikkje noko «list»-fil for «%s». Hoppar over mediet."
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         – Bruk wget til å henta fjerntliggjande filer.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      – Vis denne hjelpeteksten.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         – Bruk curl til å henta fjerntliggjande filer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "Fann parallellhandtering for nodar: %s."
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   – Avgrens nedlastingsfart.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"Tilbakekall:\n"
-"%s\n"
+"  --resume       – Ta opp att delvis nedlasta filer. (Bruk\n"
+"                   «--no-resume» for å slå av. Standard er avslått.)\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             – Omvendt søk etter kva som krev pakken.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        – Bruk valt HTTP-mellomtenar. Standard portnummer: 1080.\n"
+"                   (Format: <tenarnamn[:port]>.)\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf – versjon %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk:\n"
+"  --proxy-user   – Vel brukar og passord for mellomtenar-\n"
+"                   autentisering. (Format: <brukar:passord>.)\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet        – Ikkje vis merkelappnamn. (Standard viss ingen merkelapp\n"
-"valt på kommandolinja. Ikkje kompatibel med interaktiv modus).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr "  --bug          – Skriv feilrapport i mappa valt av neste argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         – Vis ikkje identiske linjer.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            – Bruk X-grensesnitt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"Kan ikkje bruka «--synthesis» saman med «--media», «--excludemedia», «--"
-"sortmedia», «--update» eller «--parallel»."
+"  --best-output  – Vel automatisk det beste grensesnittet etter\n"
+"                   miljø: X eller tekstmodus.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         – Bruk valt arkitektur. Versjonen gitt av                   "
-"installert\n"
-"                   «mandrake-release»-pakke blir brukt som standard.\n"
+"  --verify-rpm   – Kontroller rpm-signatur før installering.\n"
+"                   (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
+"                   Standard er å kontrollera,)\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Er dette greitt?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  – Hopp over stig (kommadelt liste).\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  – Ikkje ta med hjelpefiler.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             – Vel alle treff på kommandolinja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "Undersøkjer parallellhandtering i fila [%s]."
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             – Tillèt søk i tilbod for å finna pakkar.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting å fjerna."
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             – Ikkje søk i tilbod for å finna pakkar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Les mediumhovud til mediet «%s»."
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             – Neste pakke er ein kjeldepakke (same som «--src»).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             – Utvid spørjing til pakkeavhengnader.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             – Stillemodus.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr "  --bug          – Skriv feilrapport i mappa valt av neste argument.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  Namn og rpm-filer valt på kommandolinja blir installerte.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "Mediet «%s» har ikkje adresseinformasjon for rpm-filer."
+msgid "Choose location to save file"
+msgstr "Vel plassering av lagra fil."
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    – Viss merkelappen «sourcerpm»: kjelde-rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Kva som kan gjerast med binær-rpm-filer med «--install-src»"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "Klarte ikkje skriva «list»-fila til «%s»."
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Du har valt ein kjeldepakke:\n"
+"\n"
+"%s\n"
+"\n"
+"Du ønskjer truleg ikkje å installera han på maskina. (Du kan då\n"
+"gjera endringar i pakken, og kompilera han på nytt.)\n"
+"\n"
+"Er du sikker på at du vil installera pakken?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     – Vis merkelappen «requires«»: alle krav.\n"
+msgid "Do nothing"
+msgstr "Ikkje gjer noko."
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "Prøver å velja ikkjeeksisterande medium «%s»."
+msgid "Yes, really install it"
+msgstr "Ja, installer pakken."
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  – Vis merkelappen «description»: beskriving.\n"
+msgid "Save file"
+msgstr "Lagra fila."
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr " mislukka kopiering."
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Du er i ferd med installera denne pakken:\n"
+"\n"
+"%s\n"
+"\n"
+"Du kan òg velja å berre lagra han. Kva vil du gjera?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             – Lag alltid «hdlist»-filer.\n"
+msgid "Install it"
+msgstr "Installer han."
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Mappa [%s] finst allerie. Bruk ei anna mappe for feilrapport, eller slett "
+"denne."
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Fann inga «hdlist»-fil for mediet «%s»."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Klarte ikkje laga mappe [%s] for feilrapport."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             – Neste pakke er ein kjeldepakke (same som «--src»).\n"
+msgid "Copying failed"
+msgstr " mislukka kopiering."
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "Installerer %s."
+msgid "Only superuser is allowed to install packages"
+msgstr "Berre superbrukaren kan installera pakkar."
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "Leser rpm-filer frå [%s]."
+msgid "One of the following packages is needed:"
+msgstr "Du treng éin av desse pakkane:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Kopierer beskrivingsfila til «%s» ..."
+msgid "What is your choice? (1-%d) "
+msgstr "Kven av dei vil du ha? (1–%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         – Vel automatisk pakkar ved fleire alternativ.\n"
+msgid "Package installation..."
+msgstr "Installerer pakke ..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Klarte ikkje fjerna."
+msgid "Initializing..."
+msgstr "Gjer klar ..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      – Lag virtuelt medium som alltid er oppdatert.\n"
-"                   Berre «file://»-protokollen er støtta.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "Fann ikkje pakken «%s»."
+"Nokon av pakkane kan ikkje installerast:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "Fjernar mediet «%s»."
+msgid "do you agree ?"
+msgstr "OK?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Kan ikkje halda fram å installera, då desse pakkane først må fjernast\n"
+"for at andre skal kunna oppdaterast:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Desse pakkane må fjernast for at andre skal kunna oppgraderast:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          – Neste pakke er ein kjeldepakke (same som «-s»).\n"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Grunna avhengnader blir desse %d pakkane installerte (%d MiB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --env          – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
+"Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    – Sorter medium etter delstrengar (kommadelt liste).\n"
+msgid "unable to get source packages, aborting"
+msgstr "Fann ikkje kjeldepakke. Avbryter."
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "Klarte ikkje lesa mediet «%s»."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Set inn «%s» i eininga [%s]."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Klarte ikkje laga mediet «%s».\n"
+msgid "Press Enter when ready..."
+msgstr "Trykk så «Enter» ..."
 
-#: ../urpmf:1
+#: ../urpmi:585
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     – Vis merkelappen «packager»: pakkar.\n"
+msgid "Downloading package `%s'..."
+msgstr "Lastar ned pakken «%s» ..."
 
-#: ../urpmq:1
+#: ../urpmi:597
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  – Dump oppsettet på same form som «urpmi.addmedia»-"
-"argument.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s motteken. Tid igjen: %s. Fart: %s."
 
-#: ../urpmi:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"Du må vera «root»-brukar for å kunna installera desse avhengnadene:\n"
-"%s\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% motteken. Fart: %s."
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    – Vis endringslogg.\n"
+msgid "The following packages have bad signatures"
+msgstr "Desse pakkane har ugyldige signaturar"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "Klarte ikkje opna «list»-fila til «%s». Hoppar over mediet."
+msgid "Do you want to continue installation ?"
+msgstr "Vil du halda fram med å installera?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              – Høgreparentes for å lukka gruppeuttrykk.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Feil ved installering. Nokre filer manglar:\n"
+"%s\n"
+"Du bør oppdatera urpmi-databasen."
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "Fann ingen «webfetch». Støtta «webfetch»-ar er: %s\n"
+msgid "Installation failed"
+msgstr "Feil ved installering."
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "Les «hdlist»-fila [%s]."
+msgid "distributing %s"
+msgstr "Fordeler %s."
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "copying hdlists file..."
-msgstr "Kopierer «hdlist»-fil ..."
+msgid "installing %s"
+msgstr "Installerer %s."
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Lagrar listefil for mediet «%s»."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerer pakken «%s» (%s/%s) ..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
 
-#: ../urpmf:1
+#: ../urpmi:731
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    – Vis merkelappen «buildhost»: byggjevert.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "Do nothing"
-msgstr "Ikkje gjer noko."
+msgid "%d installation transactions failed"
+msgstr "%d mislykka installasjonstransaksjon."
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "Brukar tilknytta medium for parallellmodus: %s."
+msgid "Installation is possible"
+msgstr "Det går an å installera."
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "mounting %s"
-msgstr "Monterer «%s»."
+msgid "Everything already installed"
+msgstr "Alt er allereie installert."
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr "Startar urpmi på nytt."
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"Kan ikkje bruka mediet «%s», då «list»-fila allereie er brukt av eit anna "
-"medium."
+"Bruk: urpmi.addmedia [val] <namn> <url> [with <relativ_stig>]\n"
+"der <url> er ein av\n"
+"       file://<stig>\n"
+"       ftp://<brukarnamn>:<passord>@<vertsnamn>/<stig> with <relativt "
+"filnamn til «hdlist»>\n"
+"       ftp://<vertsnamn>/<stig> with <relativt filenamn til «hdlist»>\n"
+"       http://<vert>/<stig> with <relativt filenamn til «hdlist»>\n"
+"       removable://<stig>\n"
+"\n"
+"og [val] er av desse:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Fann ikkje kjeldepakke. Avbryter."
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       – Lag oppdateringsmedium.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         – Bruka anna rot for rpm-installering.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis – Prøv å finna og bruka syntesefil.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s motteken. Tid igjen: %s. Fart: %s."
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist – Prøv å finna og bruka «hdlist»-fil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "Reknar ut md5sum til motteken kjelde-«hdlist» (eller syntese)."
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     – Ikkje prøv å finna syntese eller «hdlist»-fil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      – Lag automatisk alle medium frå\n"
+"                   eit installasjonsmedium.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --no-uninstall – Be aldri om å avinstallera ein pakke, men avbryt "
-"installeringa.\n"
+"  --distrib-XXX  – Lag automatisk medium for XXX-delen til ein "
+"distribusjon.\n"
+"                   «XXX» kan vera «main», «contrib», «updates» eller\n"
+"                   noko anna som er sett opp.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"urpmq – versjon %s\n"
-"Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk:\n"
+"  --from         – Bruk valt adresse for liste over speglar.\n"
+"                   Standardverdi: %s.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Mottek kjelde-«hdlist» (eller syntese) til «%s» ..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      – Bruk valt distribusjonsversjon. Versjonen gitt av "
+"installert\n"
+"                   «mandrake-release»-pakke blir brukt som standard.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             – Vis òg grupper med namnet.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         – Bruk valt arkitektur. Versjonen gitt av                   "
+"installert\n"
+"                   «mandrake-release»-pakke blir brukt som standard.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Mediet «%s» er ikkje valt."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      – Lag virtuelt medium som alltid er oppdatert.\n"
+"                   Berre «file://»-protokollen er støtta.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Berre superbrukaren kan installera pakkar."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    – Ikkje bruk md5sum-kontroll.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "Brukar eigedefinert miljø på «%s»\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             – Tøm hovudlinjemellomlageret.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "Fann ikkje noko «hdlist»-fil for «%s». Hoppar over mediet."
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             – Lag alltid «hdlist»-filer.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length – Transaksjonslengd: Standardverdi: %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "Kan ikkje leggja til oppdateringar til «cooker»-distribusjonar.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              – Venstreparentes for opna gruppeuttrykk.\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "Mottek spegelliste frå «%s» ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "Treng ikkje oppgi «relativ stig til «hdlist»> med «--distrib»-valet"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             – Binær OG-operator. Sann viss begge uttrykka er sanne.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "Klarte ikkje oppdatera mediet «%s».\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"Fekk ikkje tilgang til mediet «%s».\n"
-"Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
+msgid "<relative path of hdlist> missing\n"
+msgstr "Manglar <relativ stig til «hdlist»>.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        – Vis merkelappen «group»: gruppe.\n"
+msgid "`with' missing for network media\n"
+msgstr "Manglar «with» for nettverksmedium.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        – Bruk berre gitt medium (kommadelt liste).\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "Klarte ikkje laga mediet «%s».\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
-msgstr "Klarte ikkje laga transaksjon."
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Bruk: urpmi.removemedia [-a] <namn> ...\n"
+"der <namn> er namnet på mediet som skal fjernast.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Mottek rpm-filer frå mediet «%s» ..."
+msgid "  -a             - select all media.\n"
+msgstr "  -a             – Vel alle medium.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
-"Du har valt ein kjeldepakke:\n"
 "\n"
-"%s\n"
-"\n"
-"Du ønskjer truleg ikkje å installera han på maskina. (Du kan då\n"
-"gjera endringar i pakken, og kompilera han på nytt.)\n"
-"\n"
-"Er du sikker på at du vil installera pakken?"
+"Ukjende val: «%s».\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "Fordeler %s."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Det finst ingenting som kan fjernast. (Bruk «urpmi.addmedia» til å leggja "
+"til eit medium.)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "Feil ved installering."
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"Manglar oppføringa som skal fjernast.\n"
+"(Skal vera ein av: %s.)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "Skriv oppsettfil [%s]."
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Bsage: urpmi.update [val] <namn> ...\n"
+"der <namn> er namnet på mediet som skal oppdaterast.\n"
+
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       – Berre oppdater oppdateringsmedium.\n"
+
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    – Tving oppdatering av PGP-nøkkel.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             – Vel alle ikkje-fjernbare medium.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        – Vis merkelappen «epoch»: epoke.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Det finst ingenting å oppdatera. (Bruk «urpmi.addmedia» til å leggja til "
+"medium.)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   – Kontroller rpm-signatur før installering.\n"
-"                   (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
-"                   Standard er å kontrollera,)\n"
+"Manglar oppføringa som skal oppdaterast\n"
+"(éin av %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf – versjon %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Set inn «%s» i eininga [%s]."
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         – Vis oversikt over tilgjengelege pakkar.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       – Lag oppdateringsmedium.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   – Vis oversikt over tilgjengelege medium.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     – Vis oversikt over tilgjengelge medium, med adresser.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  – Dump oppsettet på same form som «urpmi.addmedia»-"
+"argument.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   – Vis tilgjengelege nodar ved bruk av «--parallel».\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "Ugyldig «hdlist»-beskriving («%s») i «hdlists»-fila."
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "Fjernar «%s»."
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      – Hent ut hovudlinjer for pakken, frå urpmi-databasen\n"
+"til standard-ut (berre for «root»-brukaren).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  – Lag automatisk medium for XXX-delen til ein "
-"distribusjon.\n"
-"                   «XXX» kan vera «main», «contrib», «updates» eller\n"
-"                   noko anna som er sett opp.\n"
+"  --sources      – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
+"brukar).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         – Vis merkelappen «size»: storleik.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  – Set opp urpmi direkte frå eit distribusjonstre.\n"
+"                   Med dette kan du gjera spørjingar på ein distribusjon.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "for å kunna behalda «%s»"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    – Vis endringslogg.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "då «%s» ikkje er tilfredsstilt"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             – Utvid spørjing til pakkeavhengnader.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatisk pakkeinstallering ...\n"
-"Du har bedt om installering av pakken %s.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-databasen er låst."
+"  -u             – Fjern pakkar viss nyare versjonar allereie er "
+"installerte.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
-"  --resume       – Ta opp att delvis nedlasta filer. (Bruk\n"
-"                   «--no-resume» for å slå av. Standard er avslått.)\n"
+"  -c             – Fullstendig oversikt over pakken som skal fjernast.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "Les offentlegnøkkelfila til «%s» ..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             – Omvendt søk etter kva som krev pakken.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    – Ikkje bruk md5sum-kontroll.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             – Vis nyttig informasjon i lettlesbart format.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Brukar flyttbar eining som «%s»."
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             – Vis òg grupper med namnet.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Du er i ferd med installera denne pakken:\n"
-"\n"
-"%s\n"
-"\n"
-"Du kan òg velja å berre lagra han. Kva vil du gjera?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             – Vis òg versjonsinformasjon med namnet.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        – Bruk òg ikkje-ordrett søk (same som «-y»).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             – Vis oversikt over filer i pakken.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             – Fjern pakkar viss nyare versjonar allereie er "
-"installerte.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  namn og rpm-filer gitt på kommandolinja blir førespurd.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist – Prøv å finna og bruka «hdlist»-fil.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "då «%s» manglar"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       – Bruk berre oppdateringsmedium.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"Bsage: urpmi.update [val] <namn> ...\n"
-"der <namn> er namnet på mediet som skal oppdaterast.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "Prøver å hoppa over eksisterande medium «%s». Unngår"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Du treng éin av desse pakkane for å installera «%s»:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         – kontroller at installeringa kan fungera.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq – versjon %s\n"
+#~ "Copyright © 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+#~ "lisensen.\n"
+#~ "\n"
+#~ "Bruk:\n"
diff --git a/po/pl.po b/po/pl.po
index 4b8e7d4c..da1a7034 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-02 10:12+0100\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -34,879 +34,784 @@ msgstr "TtYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalowanie %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automatycznie tworzy wszystkie nośniki z nośnika\n"
-"                   instalacyjnego.\n"
+"Automatyczna instalacja pakietów...\n"
+"Zgłoszono polecenie instalacji pakietu %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "nie można otworzyć bazy danych rpm"
+msgid "Is this OK?"
+msgstr "W porządku?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Jeden z poniższych pakietów musi zostać zainstalowany %s:"
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "usuwanie pakietu %s"
+msgid " (Y/n) "
+msgstr " (T/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: polecenie nie zostało odnalezione\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Nie można użyć trybu zrównoleglenia z trybem use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"użycie: %s [opcje]\n"
+"gdzie [opcjami] mogą być\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "wszystko zostało już zainstalowane"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - wyświetla ten komunikat pomocy.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - czyści katalog nagłówków pamięci podręcznej.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  -g [group]      - ogranicza wyniki do zadanej grupy.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "użycie procesu %d do uruchomienia transakcji"
+msgid "                    defaults is %s.\n"
+msgstr "                    domyślną wartością jest %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - wyświetla zanacznik provides: wszyst. pakiety.\n"
+msgid "unknown protocol defined for %s"
+msgstr "nieznany protokół zdefiniowany dla %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Jaki jest Twój wybór? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nie znaleziono narzędzia do pobierania stron, obsługiwanymi są: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "znaleziono %d nagłowków w pamięci podręcznej"
+msgid "unable to handle protocol: %s"
+msgstr "nie można obsłużyć protokołu: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "Istnieje wiele pakietów o tej samej nazwie pliku rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "błąd składni pliku konfiguracyjnego w wierszu %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - określa użytkownika i hasło używane do uwierzytelnienia\n"
-"                   na serwerze pośredniczącym (format <użytkownik:hasło>)\n"
+"nośnik \"%s\" próbuje używać wykorzystany już plik hdlist, zignorowano nośnik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "podejmowanie kolejnej operacji obliczenia zależności\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "nośnik \"%s\" próbuje użyć już wykorzystaną listę, zignorowano nośnik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "pobieranie pliku rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"Nie można sprawdzić \"%s\" gdyż plik listy jest używany przez inny nośnik "
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases    - wypisuje dostępne równoległe aliasy.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nie można użyć nazwy \"%s\" dla nienazwanego nośnika, ponieważ jest ona już "
+"używana"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pobieranie nie powiodło się: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"nie można przypisać nośnika \"%s\" do konta, gdyż nie istnieje plik listy [%"
+"s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nie można zbadać pliku listy związanego z \"%s\", nośnik zignorowano"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nie można określić nośnika związanego z tym plikiem hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -a             - operator binarny AND, prawda gdy jedno wyrażenie "
-"prawdziwe.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nie można uzyskać dostępu do pliku hdlist \"%s\", zignorowano nośnik"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instalacja pakietu..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"nie można uzyskać dostępu do pliku listy związanego z \"%s\", zignorowano "
+"nośnik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "niepoprawna nazwa pliku rpm [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "próba przełączenia istniejącego nośnika \"%s\", anulowano"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"wirtualny nośnik \"%s\" nie powinien posiadać zdefiniowanego pliku hdlist "
+"lub listy, zignorowano nośnik"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"wirtualny nośnik \"%s\" powinien posiadać jasny url, zignorowano nośnik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"brak dostępu do pierwszego nośnika instalacyjnego (nie znaleziono pliku "
-"Mandrake/base/hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nie można znaleźć pliku hdlist dla \"%s\" nośnik zignorowano"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Niestety, niepoprawny wybór, spróbuj ponownie\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nie można znaleźć pliku listy dla \"%s\", nośnik zignorowano"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Wybierz miejsce zapisania pliku"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "niespójny plik listy dla \"%s\", nośnik zignorowano"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - wyświetla znacznik summary: zestawienie.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nie można zbadać pliku listy związanego z \"%s\", nośnik zignorowano"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Następujące pakiety zawierają %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "zbyt dużo punktów montowania dla wymiennego nośnika \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Zainstaluj go"
+msgid "taking removable device as \"%s\""
+msgstr "traktowanie napędu wymiennego jako \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - używa interfejsu X Window.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "używanie innego urządzenia wymiennego [%s] dla \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Wymagany jest jeden z następujących pakietów:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nie można pobrać ścieżki dla nośnika wymiennego \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"W celu spełnienia zależności zostaną usunięte następujące pakiety (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "nie można zapisać pliku konfiguracyjnego [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - wybiera najlepszy interfejs w zależności od środowiska:\n"
-"                   X Window lub tryb tekstowy.\n"
+msgid "write config file [%s]"
+msgstr "zapisywanie pliku konfiguracyjnego [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Pobieranie pakietu \"%s\"..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Nie można użyć trybu zrównoleglenia z trybem use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-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"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nie można przetworzyć \"%s\" w pliku [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatycznie wybiera pakiety aktualizujące system.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "badanie równoległej funkcji obsługi w pliku [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "brak pakietu o nazwie %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "znaleziono równoległą funkcję obsługi dla węzłów: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - wybiera wszystkie dopasowania w wierszu poleceń.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "użycie nośnika przypisanego dla trybu równoległego: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalacja zakończona niepowodzeniem, brakuje kilku plików:\n"
-"%s\n"
-"Może zachodzić potrzeba aktualizacji bazy danych urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "nie można użyć równoległej opcji \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"użycie: urpmi.removemedia [-a] <nazwa> ...\n"
-"gdzie <nazwa> jest nazwą nośnika do usunięcia.\n"
+"opcja --synthesis nie może być używana z opcją --media, --excludemedia, --"
+"sortmedia, --update lub --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalacja nie może być kontynuowana ponieważ poniższe pakiety\n"
-"muszą zostać usunięte aby zaktualizować inne:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "sprawdzanie pliku syntezy [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "brakujący parametr \"with\" dla nośnika sieciowego\n"
+msgid "examining hdlist file [%s]"
+msgstr "badanie pliku hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - wypisuje pliki w pakiecie.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "wirtualny nośnik \"%s\" nie jest lokalny, zignorowano nośnik"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "nieznany pakiet"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalacja jest możliwa"
+msgid "performing second pass to compute dependencies\n"
+msgstr "podejmowanie kolejnej operacji obliczenia zależności\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "pomijanie pakietu %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Zostaną zainstalowane następujące %d pakiety w celu spełnienia zależności (%"
-"d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "mogłoby to spowodować zainstalowanie zamiast uaktualnienia pakietu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"nie można przypisać nośnika \"%s\" do konta, gdyż nie istnieje plik listy [%"
-"s]"
+msgid "unable to open rpmdb"
+msgstr "nie można otworzyć bazy danych rpm"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "nośnik \"%s\" już istnieje"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nie można dodać aktualizacji dystrybucji cooker\n"
+msgid "virtual medium need to be local"
+msgstr "nośnik wirtualny musi być lokalny"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - tryb komunikatywny.\n"
+msgid "added medium %s"
+msgstr "dodany nośnik %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicjalizacja..."
+msgid "unable to access first installation medium"
+msgstr "brak dostępu do pierwszego nośnika instalacyjnego"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - wypisuje dostępne pakiety.\n"
+msgid "copying hdlists file..."
+msgstr "kopiowanie pliku hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - wyświetla wszystkie znaczniki.\n"
+msgid "...copying failed"
+msgstr "...kopiowanie zakończone niepowodzeniem"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
+msgid "...copying done"
+msgstr "...kopiowanie zakończone"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"wirtualny nośnik \"%s\" nie powinien posiadać zdefiniowanego pliku hdlist "
-"lub listy, zignorowano nośnik"
+"brak dostępu do pierwszego nośnika instalacyjnego (nie znaleziono pliku "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "obliczanie sumy md5 skopiowanego źródłowego pliku hdlist (lub syntezy)"
+msgid "retrieving hdlists file..."
+msgstr "pobieranie pliku hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - wyłącza ścieżki oddzielone przecinkami.\n"
+msgid "...retrieving done"
+msgstr "...pobieranie zakończone"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
+msgid "...retrieving failed: %s"
+msgstr "...pobieranie nie powiodło się: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nieznane opcje \"%s\"\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "niepoprawny opis hdlist \"%s\" w pliku hdlist"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - rozdziela niewielkie transakcje jeśli zostanie\n"
-"                   zainstalowana lub uaktualniona większa liczba\n"
-"                   pakietów niż zadana, domyślną wartością jest %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "próba wyboru nieistniejącego nośnika \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "wybieranie wielu nośników: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - używa wgeta do pobierania zdalnych plików.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "usuwanie nośnika \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
+"Nie można uzyskać dostępu do nośnika \"%s\",\n"
+"To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
+"zamontowany ręcznie."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes   - wypisuje dostępne węzły gdy używana jest opcja --"
-"parallel.\n"
+"wirtualny nośnik \"%s\" powinien posiadać poprawny plik źródłowy hdlist lub "
+"syntezy, zignorowano nośnik"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "budowanie pliku hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - zachowuje, jeśli to możliwe, istniejące pakiety\n"
-"                   odrzuca żądane pakiety prowadzące do usunięcia innych.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "obliczanie sumy md5 istniejącego pliku źródłowego hdlist (lub syntezy)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "badanie pliku MD5SUM"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: polecenie nie zostało odnalezione\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopiowanie źródła hdlist (lub syntezy) związanego z \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "nie można zarejestrować pliku rpm"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - umożliwia użytkownikownikowi, który sobie zażyczy,\n"
-"                   instalację pakietów bez sprawdzania zależności.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "obliczanie sumy md5 skopiowanego źródłowego pliku hdlist (lub syntezy)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nie można obsłużyć protokołu: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiowanie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "pobieranie pliku hdlist..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Tak, naprawdę zainstaluj go"
+msgid "reading rpm files from [%s]"
+msgstr "odczytywanie plików rpm z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "dodany nośnik %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nie można czytać plików rpm z [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
-"  --noclean      - zachowuje pliki rpm nie używane w pamięci podręcznej.\n"
+msgid "no rpm files found from [%s]"
+msgstr "nie znaleziono żadnych plików rpm z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
-"utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
-"aktualizacja=%d)"
+"pobieranie pliku źródłowego hdlist (lub syntezy) związanego z \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "md5sum mismatch"
-msgstr "niezgodność sumy md5"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "znaleziono zbadany plik hdlist (lub synthesis) jako %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "błąd składni pliku konfiguracyjnego w wierszu %s"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "obliczanie sumy md5 pobranego pliku źródłowego hdlist (lub syntezy)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
+msgid "md5sum mismatch"
+msgstr "niezgodność sumy md5"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
-"  --proxy        - używa wybranego pośrednika HTTP, domyślnym portem\n"
-"                   jest port 1080 (format <serwerproxy[:port]>).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to install %s"
-msgstr "w celu zainstalowania pakietu %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relokowano %s wpisów w liście zależności deplist"
+"pobieranie pliku źródłowego hdlist (lub syntezy) zakończone niepowodzeniem"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "plik [%s] już został użyty w tym samym nośniku \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "mogłoby to spowodować zainstalowanie zamiast uaktualnienia pakietu %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nie można przetworzyć pliku hdlist związanego z \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "pobieranie serwerów pośredniczących z %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "nie można zapisać pliku listy związanego z \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - wyświetla znacznik url: adres url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "zapisywanie pliku listy dla nośnika \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nieznany protokół zdefiniowany dla %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "nic nie zostało zapisane do pliku listy dla \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - wyświetla wersję i wydanie wraz z nazwą.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - wyświetla znacznik obsoletes: wszystkie przestarzałe.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "nośnik \"%s\" już istnieje"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instalowanie %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "odczytywanie nagłówków z nośnika \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"brak wpisu do aktualizacji\n"
-"(jeden z %s)\n"
+msgid "building hdlist [%s]"
+msgstr "budowanie pliku hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "próba ulepszenia %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "zbudowano plik syntezy dla nośnika \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nie można usunąć pakietu %s"
+msgid "found %d headers in cache"
+msgstr "znaleziono %d nagłowków w pamięci podręcznej"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "usuwanie %d przestarzałych nagłowków w pamięci cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"brak wpisu do usunięcia\n"
-"(jeden z %s)\n"
+msgid "mounting %s"
+msgstr "montowanie %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - wybiera wszystkie nośniki.\n"
+msgid "unmounting %s"
+msgstr "odmontowywanie %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Brakujący podpis (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "relokowano %s wpisów w liście zależności deplist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nie można czytać plików rpm z [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "żaden wpis nie został relokowany na liście zależności deplist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - rozproszone urpmi z użyciem komputerów aliasu.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "niepoprawna nazwa pliku rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "pobieranie pliku rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (T/n) "
+msgid "unable to register rpm file"
+msgstr "nie można zarejestrować pliku rpm"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  -g [group]      - ogranicza wyniki do zadanej grupy.\n"
+msgid "error registering local packages"
+msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "nośnik \"%s\" próbuje użyć już wykorzystaną listę, zignorowano nośnik"
+msgid "no package named %s"
+msgstr "brak pakietu o nazwie %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "niepoprawne wejście: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Następujące pakiety zawierają %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Istnieje wiele pakietów o tej samej nazwie pliku rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - wypisuje dostępne nośniki.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nie można poprawnie przetworzyć [%s] przy wartości \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
+"nośnik \"%s\" używa niepoprawnego pliku listy:\n"
+"serwer zwierciadlany jest prawdopodobnie nieaktualny,\n"
+"próba wykorzystania metody alternatywnej"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "żaden wpis nie został relokowany na liście zależności deplist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "nośnik \"%s\" nie określa żadnej lokalizacji dla plików rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instaluje tylko pakiet źródłowy (bez binariów).\n"
+msgid "package %s is not found."
+msgstr "pakiet %s nie został odnaleziony."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - używa curla do pobierania zdalnych plików.\n"
+msgid "urpmi database locked"
+msgstr "baza danych urpmi jest zablokowana"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "nośnik \"%s\" nie został wybrany"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "czy się zgadzasz ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nie można czytać pliku rpm [%s] z nośnika \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "niespójny plik listy dla \"%s\", nośnik zignorowano"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "niespójny nośnik \"%s\" zaznaczony jako wymienny ale niekoniecznie"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...pobieranie zakończone"
+msgid "unable to access medium \"%s\""
+msgstr "nie można uzyskać dostępu do nośnika \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "dodawanie pakietu %s (id=%d, eid=%d, aktualizacja=%d, plik=%s)"
+msgid "malformed input: [%s]"
+msgstr "niepoprawne wejście: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "pomijanie pakietu %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "pobieranie plików rpm z nośnika \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Niepoprawny podpis (%s)"
+msgid "Preparing..."
+msgstr "Przygotowywanie..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-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"
+msgid "using process %d for executing transaction"
+msgstr "użycie procesu %d do uruchomienia transakcji"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi wersja %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"To jest oprogramowanie otwarte i może być rozpowszechniane na zasadach "
-"licencji GNU GPL.\n"
-"\n"
-"użycie:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nie można poprawnie przetworzyć [%s] przy wartości \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - bez używania podanych nośników, rozdzielonych "
-"przecinkami.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nie można określić nośnika związanego z tym plikiem hdlist [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nie można przetworzyć pliku hdlist związanego z \"%s\""
+"utworzono transakcję dla instalacji na %s (usuwanie=%d, instalacja=%d, "
+"aktualizacja=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"nośnik \"%s\" próbuje używać wykorzystany już plik hdlist, zignorowano nośnik"
+msgid "unable to create transaction"
+msgstr "nie można utworzyć transakcji"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "z powodu kolizji z pakietem %s"
+msgid "removing package %s"
+msgstr "usuwanie pakietu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "usuwanie %d przestarzałych nagłowków w pamięci cache"
+msgid "unable to remove package %s"
+msgstr "nie można usunąć pakietu %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nie można zaktualizować nośnika \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "dodawanie pakietu %s (id=%d, eid=%d, aktualizacja=%d, plik=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
+msgid "unable to install package %s"
+msgstr "nie można zainstalować pakietu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "wirtualny nośnik \"%s\" nie jest lokalny, zignorowano nośnik"
+msgid "due to missing %s"
+msgstr "z powodu brakującego %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Przygotowywanie..."
+msgid "due to unsatisfied %s"
+msgstr "z powodu niesatysfakcjonującego pakietu %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    domyślną wartością jest %s.\n"
+msgid "trying to promote %s"
+msgstr "próba ulepszenia %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "używanie innego urządzenia wymiennego [%s] dla \"%s\""
+msgid "in order to keep %s"
+msgstr "w celu zachowania pakietu %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - bez próby odnalezienia żadnego pliku syntezy\n"
-"                   lub hdlist.\n"
+msgid "in order to install %s"
+msgstr "w celu zainstalowania pakietu %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
+msgid "due to conflicts with %s"
+msgstr "z powodu kolizji z pakietem %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiowanie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
+msgid "unrequested"
+msgstr "niezgłoszony"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego.\n"
-"                   Ta opcja pozwala na odpytywanie dystrybucji.\n"
+msgid "Invalid signature (%s)"
+msgstr "Niepoprawny podpis (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"użycie: %s [opcje]\n"
-"gdzie [opcjami] mogą być\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Niepopwawny identyfikator klucza (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
+msgid "Missing signature (%s)"
+msgstr "Brakujący podpis (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nie można użyć nazwy \"%s\" dla nienazwanego nośnika, ponieważ jest ona już "
-"używana"
+msgid "bad proxy declaration on command line\n"
+msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts    - wyświetla znacznik conflicts: wszystkie konflikty.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"wirtualny nośnik \"%s\" powinien posiadać poprawny plik źródłowy hdlist lub "
-"syntezy, zignorowano nośnik"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Niestety, niepoprawny wybór, spróbuj ponownie\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -923,1099 +828,1240 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatycznie wybiera najlepszy pakiet z listy.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"użycie: urpmi.addmedia [opcje] <nazwa> <url> [with <ścieżka względna>]\n"
-"gdzie <url> może przyjmować postać\n"
-"       file://<ścieżka>\n"
-"       ftp://<login>:<hasło>@<komputer>/<ścieżka> with <względna nazwa pliku "
-"hdlist>\n"
-"       ftp://<komputer>/<ścieżka> with <wzlględna nazwa pliku hdlist>\n"
-"       http://<komputer>/<ścieżka> with <względna nazwa pliku hdlist>\n"
-"       removable://<ścieżka>\n"
-"\n"
-"zaś [opcje] mogą przyjmować wartości\n"
+"  --test         - sprawdza, czy instalacja zostanie przeprowadzona "
+"prawidłowo.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopiowanie źródła hdlist (lub syntezy) związanego z \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - wymusza wywoływanie nawet przy braku niektórych "
+"pakietów.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiowanie zakończone"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - rozproszone urpmi z użyciem komputerów aliasu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nie można użyć równoległej opcji \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - używa innego katalogu głównego do instalacji rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"nośnik \"%s\" używa niepoprawnego pliku listy:\n"
-"serwer zwierciadlany jest prawdopodobnie nieaktualny,\n"
-"próba wykorzystania metody alternatywnej"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access first installation medium"
-msgstr "brak dostępu do pierwszego nośnika instalacyjnego"
+"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
+"                   użyteczne przy (od)instalowywania chroot z opcją --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "nośnik wirtualny musi być lokalny"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - tryb komunikatywny.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "error registering local packages"
-msgstr "błąd w trakcie rejestrowania pakietów lokalnych"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - wybiera wszystkie pasujące pakiety.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - ogranicza szybkość pobierania.\n"
+msgid "unknown packages"
+msgstr "nieznane pakiety"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "znaleziono zbadany plik hdlist (lub synthesis) jako %s"
+msgid "unknown package"
+msgstr "nieznany pakiet"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr ""
-"pobieranie pliku źródłowego hdlist (lub syntezy) zakończone niepowodzeniem"
+msgid "removing package %s will break your system"
+msgstr "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nie znaleziono żadnych plików rpm z [%s]"
+msgid "Nothing to remove"
+msgstr "Brak elementów do usunięcia."
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nic nie zostało zapisane do pliku listy dla \"%s\""
+msgid "Checking to remove the following packages"
+msgstr "Zaznaczanie do usunięcia następujących pakietów"
 
-#: ../urpmi:1
+#: ../urpme:106
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Następujące pakiety zawierają niepoprawne podpisy"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"W celu spełnienia zależności zostaną usunięte następujące pakiety (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "obliczanie sumy md5 istniejącego pliku źródłowego hdlist (lub syntezy)"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpmq:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - zapełnia wyjście pakietami do usunięcia.\n"
+msgid "removing %s"
+msgstr "usuwanie %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "unable to install package %s"
-msgstr "nie można zainstalować pakietu %s"
+msgid "Removing failed"
+msgstr "Usuwanie zakończone niepowodzeniem"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - umożliwia użytkownikowi, który sobie tego zażyczy\n"
-"                   instalację pakietów bez sprawdzania zależności\n"
-"                   i spójności.\n"
+"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"
+"użycie:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Zapisz plik"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - używa tylko podanych nośników, rozdzielonych "
+"przecinkami.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nie można zapisać pliku konfiguracyjnego [%s]"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - bez używania podanych nośników, rozdzielonych "
+"przecinkami.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - wybiera wszystkie pasujące pakiety.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
+"                   przecinkami.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Niepopwawny identyfikator klucza (%s)"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - używa pliku syntezy podanego zamiast bazy urpmi.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - tryb komunikatywny.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - wymusza wywoływanie nawet przy braku niektórych "
-"pakietów.\n"
+"  --quiet         - bez wyświetlania nazwy znacznika\n"
+"                    (domyślny tryb jeśli nie podano znacznika w wierszu).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nie można pobrać ścieżki dla nośnika wymiennego \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - próbuje znaleźć i użyć plik syntezy.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - wyświetla wszystkie znaczniki.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - wyświetla znacznik group: grupa.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - wymusza aktualizację klucza gpg.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - wyświetla znacznik size: rozmiar.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "brak <ścieżki względnej do pliku hdlist>\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - wyświetla znacznik epoch: iteracja.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Zaznaczanie do usunięcia następujących pakietów"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - wyświetla znacznik summary: zestawienie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "niezgłoszony"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - wyświetla znacznik description: opis.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nie można uzyskać dostępu do pliku rpm [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - wyświetla znacznik sourcerpm: źródło rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - wyświetla znacznik files: wszystkie pliki.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr ""
+"  --packager     - wyświetla znacznik packager: osoba tworząca pakiet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nie można przetworzyć \"%s\" w pliku [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Czy chcesz kontynuować instalację ?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - wyświetla znacznik url: adres url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nie można czytać pliku rpm [%s] z nośnika \"%s\""
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - wyświetla zanacznik provides: wszyst. pakiety.\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
-"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
-"                   opcja użyteczna przy instalacji chroot z opcją --root.\n"
+"  --requires     - wyświetla znacznik requires: wszystkie zależności.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "zbudowano plik syntezy dla nośnika \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - wyświetla znacznik files: wszystkie pliki.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
-"  -i             - wyświetla użyteczne informacje w czytelnej formie.\n"
+"  --conflicts    - wyświetla znacznik conflicts: wszystkie konflikty.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes    - wyświetla znacznik obsoletes: wszystkie przestarzałe.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - używa określonej wersji dystrybucji, domyślną wersją\n"
-"                   jest wersja zainstalowanego pakietu mandrake-release.\n"
+"  --env          - używa określonego środowiska (typowo raport błędów).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
+
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - używa określonego adresu url z listy mirrorów, domyślnie\n"
-"                   %s\n"
+"  -a             - operator binarny AND, prawda gdy oba wyrażenia "
+"prawdziwe.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
-"                   użyteczne przy (od)instalowywania chroot z opcją --root.\n"
+"  -a             - operator binarny AND, prawda gdy jedno wyrażenie "
+"prawdziwe.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !             - modyfikator NOT, prawda jeśli wyrażenie fałszywe.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - lewy nawias do otwierania wyrażenia grupowego.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - prawy nawias do zamykania wyrażenia grupowego.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go "
-"usuń"
+"wywołanie zwrotne jest :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "odmontowywanie %s"
+msgid "using specific environment on %s\n"
+msgstr "używając określonego środowiska na %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% gotowe, szybkość = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi wersja %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest oprogramowanie otwarte i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
+"\n"
+"użycie:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "ponownie uruchamianie urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sprawdzanie pliku syntezy [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatycznie wybiera pakiety aktualizujące system.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Czy chesz spróbować wymusić instalację (--force)? (t/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa "
+"instalację.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiowanie zakończone niepowodzeniem"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - zachowuje, jeśli to możliwe, istniejące pakiety\n"
+"                   odrzuca żądane pakiety prowadzące do usunięcia innych.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nie można uzyskać dostępu do pliku hdlist \"%s\", zignorowano nośnik"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - rozdziela niewielkie transakcje jeśli zostanie\n"
+"                   zainstalowana lub uaktualniona większa liczba\n"
+"                   pakietów niż zadana, domyślną wartością jest %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tryb cichy.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - mały rozmiar transakcji, domyślna wartość to %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - tryb komunikatywny.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - wymusza wyszukiwanie niespójności (tak jak -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
-"                   (tylko root).\n"
+"  --src          - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - wybiera nagłówki z pakietu wypisane z bazy danych urpmi\n"
-"                   na wyjście standardowe (tylko root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instaluje tylko pakiet źródłowy (bez binariów).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "nieznane pakiety"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - zaczyna od usuwania plików rpm z pamięci podręcznej.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "wybieranie wielu nośników: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+"  --noclean      - zachowuje pliki rpm nie używane w pamięci podręcznej.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - umożliwia użytkownikownikowi, który sobie zażyczy,\n"
+"                   instalację pakietów bez sprawdzania zależności.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "plik [%s] już został użyty w tym samym nośniku \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - umożliwia użytkownikowi, który sobie tego zażyczy\n"
+"                   instalację pakietów bez sprawdzania zależności\n"
+"                   i spójności.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "brak elementów do usunięcia (użyj urpmi.addmedia aby dodać nośnik)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
+"                   opcja użyteczna przy instalacji chroot z opcją --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nie można znaleźć pliku listy dla \"%s\", nośnik zignorowano"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - używa wgeta do pobierania zdalnych plików.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - wyświetla ten komunikat pomocy.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - używa curla do pobierania zdalnych plików.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "znaleziono równoległą funkcję obsługi dla węzłów: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - ogranicza szybkość pobierania.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"wywołanie zwrotne jest :\n"
-"%s\n"
+"  --resume       - wznawia przesyłanie częściowo porabnych plików\n"
+"                   (--no-resume wyłącza funkcję, domyślnie wyłączoną).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - używa wybranego pośrednika HTTP, domyślnym portem\n"
+"                   jest port 1080 (format <serwerproxy[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\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"
-"użycie:\n"
+"  --proxy-user   - określa użytkownika i hasło używane do uwierzytelnienia\n"
+"                   na serwerze pośredniczącym (format <użytkownik:hasło>)\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - bez wyświetlania nazwy znacznika\n"
-"                    (domyślny tryb jeśli nie podano znacznika w wierszu).\n"
+"  --bug          - raport błędów w katalogu wskazanym przez\n"
+"                   następny argument\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - używa interfejsu X Window.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"opcja --synthesis nie może być używana z opcją --media, --excludemedia, --"
-"sortmedia, --update lub --parallel"
+"  --best-output  - wybiera najlepszy interfejs w zależności od środowiska:\n"
+"                   X Window lub tryb tekstowy.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - używa określonej architektury, domyślną jest\n"
-"                   architektura zinstalowanego pakietu mandrake-release.\n"
+"  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacją.\n"
+"                   (--no-verify-rpm wyłącza, domyślnie włączone).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "W porządku?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - wyłącza ścieżki oddzielone przecinkami.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - wyłącza pliki dokumentacji.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - używa pliku syntezy podanego zamiast bazy urpmi.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - wybiera wszystkie dopasowania w wierszu poleceń.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "badanie równoległej funkcji obsługi w pliku [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - umożliwia wyszukiwanie serwerów przy szukaniu pakietów.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Brak elementów do usunięcia."
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - nie przeszukuje serwerów przy wyszukiwaniu pakietów.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "odczytywanie nagłówków z nośnika \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - rozszerza zapytania o zależności międzypakietowe.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tryb cichy.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - raport błędów w katalogu wskazanym przez\n"
-"                   następny argument\n"
+"  nazwy lub pliki rpm podane w wierszu poleceń zostaną zainstalowane.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "nośnik \"%s\" nie określa żadnej lokalizacji dla plików rpm"
+msgid "Choose location to save file"
+msgstr "Wybierz miejsce zapisania pliku"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - wyświetla znacznik sourcerpm: źródło rpm.\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"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nie można zapisać pliku listy związanego z \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Wybrano pakiet źródłowy:\n"
+"\n"
+"%s\n"
+"\n"
+"Prawdopodobnie nie miałeś/aś ochoty zainstalować go (zainstalowanie go\n"
+"pozwoliłoby na wprowadzenie zmian do kodu źródłowego i skompilowanie go).\n"
+"\n"
+"Co chcesz zrobić?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr ""
-"  --requires     - wyświetla znacznik requires: wszystkie zależności.\n"
+msgid "Do nothing"
+msgstr "Nic nie rób"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "próba wyboru nieistniejącego nośnika \"%s\""
+msgid "Yes, really install it"
+msgstr "Tak, naprawdę zainstaluj go"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - wyświetla znacznik description: opis.\n"
+msgid "Save file"
+msgstr "Zapisz plik"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiowanie zakończone niepowodzeniem"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Następujący pakiet oprogramowania zostaną zainstalowane na komputerze:\n"
+"\n"
+"%s\n"
+"\n"
+"Być może będziesz mieć ochotę go zapisać. Jaki jest twój wybór?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - wymusza generację plików hdlist.\n"
+msgid "Install it"
+msgstr "Zainstaluj go"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes może być użyta tylko z opcją --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Katalog [%s] już istnieje, użyj innego katalogu do zgłoszenia błędu lub go "
+"usuń"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "nie można utworzyć katalogu [%s] dla raportu o błędach"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - następny pakiet jest pakietem źródłowym (tak jak --src).\n"
+msgid "Copying failed"
+msgstr "Kopiowanie zakończone niepowodzeniem"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "instalowanie %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Tylko administrator ma prawo instalować pakiety"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "odczytywanie plików rpm z [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Wymagany jest jeden z następujących pakietów:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Jaki jest Twój wybór? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatycznie wybiera najlepszy pakiet z listy.\n"
+msgid "Package installation..."
+msgstr "Instalacja pakietu..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Usuwanie zakończone niepowodzeniem"
+msgid "Initializing..."
+msgstr "Inicjalizacja..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - tworzy nośniki, które są zawsze aktualne,\n"
-"                   dozwolony jest tylko protokół file://.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "pakiet %s nie został odnaleziony."
+"Niektóre z wybranych pakietów nie mogą zostać zainstalowane:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "usuwanie nośnika \"%s\""
+msgid "do you agree ?"
+msgstr "czy się zgadzasz ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"nie ma potrzeby podawania <ścieżki_względnej lub hdlisty> z opcją --distrib"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Cancel"
-msgstr "Anuluj"
+"Instalacja nie może być kontynuowana ponieważ poniższe pakiety\n"
+"muszą zostać usunięte aby zaktualizować inne:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - następny pakiet jest pakietem źródłowym (tak jak -s).\n"
+"Poniższe pakiety muszą być usunięte aby zaktualizować inne:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - używa określonego środowiska (typowo raport błędów).\n"
+"Zostaną zainstalowane następujące %d pakiety w celu spełnienia zależności (%"
+"d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
-"                   przecinkami.\n"
+"Aby zainstalować następujące zależności należy zrobić to z konta roota:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nie można uzyskać dostępu do nośnika \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nie można utworzyć nośnika \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Włóż nośnik o nazwie \"%s\" do napędu [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr ""
-"  --packager     - wyświetla znacznik packager: osoba tworząca pakiet.\n"
+msgid "Press Enter when ready..."
+msgstr "Naciśnij enter jeśli jesteś gotowy(-a)..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
+msgid "Downloading package `%s'..."
+msgstr "Pobieranie pakietu \"%s\"..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s gotowe, ETA = %s, szybkość = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% gotowe, szybkość = %s"
 
-#: ../urpmi:1
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Następujące pakiety zawierają niepoprawne podpisy"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Czy chcesz kontynuować instalację ?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Aby zainstalować następujące zależności należy zrobić to z konta roota:\n"
+"Instalacja zakończona niepowodzeniem, brakuje kilku plików:\n"
 "%s\n"
+"Może zachodzić potrzeba aktualizacji bazy danych urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - wyświetla dziennik zmian.\n"
+msgid "Installation failed"
+msgstr "Instalacja nie powiodła się"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"nie można uzyskać dostępu do pliku listy związanego z \"%s\", zignorowano "
-"nośnik"
+msgid "distributing %s"
+msgstr "rozpowszechnianie %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - prawy nawias do zamykania wyrażenia grupowego.\n"
+msgid "installing %s"
+msgstr "instalowanie %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nie znaleziono narzędzia do pobierania stron, obsługiwanymi są: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "badanie pliku hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Próbować instalować bez sprawdzania zależności? (t/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopiowanie pliku hdlist..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Czy chesz spróbować wymusić instalację (--force)? (t/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "zapisywanie pliku listy dla nośnika \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d transakcji instalacyjnych zakończonych niepowodzeniem"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"wirtualny nośnik \"%s\" powinien posiadać jasny url, zignorowano nośnik"
+msgid "Installation is possible"
+msgstr "Instalacja jest możliwa"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "wszystko zostało już zainstalowane"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "ponownie uruchamianie urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
+"użycie: urpmi.addmedia [opcje] <nazwa> <url> [with <ścieżka względna>]\n"
+"gdzie <url> może przyjmować postać\n"
+"       file://<ścieżka>\n"
+"       ftp://<login>:<hasło>@<komputer>/<ścieżka> with <względna nazwa pliku "
+"hdlist>\n"
+"       ftp://<komputer>/<ścieżka> with <wzlględna nazwa pliku hdlist>\n"
+"       http://<komputer>/<ścieżka> with <względna nazwa pliku hdlist>\n"
+"       removable://<ścieżka>\n"
+"\n"
+"zaś [opcje] mogą przyjmować wartości\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "Nic nie rób"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - tworzy nośnik aktualizacyjny.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "użycie nośnika przypisanego dla trybu równoległego: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - próbuje znaleźć i użyć plik syntezy.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "montowanie %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - próbuje znaleźć i użyć plik hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"Nie można sprawdzić \"%s\" gdyż plik listy jest używany przez inny nośnik "
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
+"  --no-probe     - bez próby odnalezienia żadnego pliku syntezy\n"
+"                   lub hdlist.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - używa innego katalogu głównego do instalacji rpm.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatycznie tworzy wszystkie nośniki z nośnika\n"
+"                   instalacyjnego.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s gotowe, ETA = %s, szybkość = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automatycznie tworzy nośnik dla części XXX dystrybucji,\n"
+"                   XXX może mieć wartość main, contrib, updates lub\n"
+"                   cokolwiek innego co zostało skonfigurowane ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "obliczanie sumy md5 pobranego pliku źródłowego hdlist (lub syntezy)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - używa określonego adresu url z listy mirrorów, domyślnie\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - używa określonej wersji dystrybucji, domyślną wersją\n"
+"                   jest wersja zainstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nigdy nie pyta o odinstalowanie pakietu, przerywa "
-"instalację.\n"
+"  --arch         - używa określonej architektury, domyślną jest\n"
+"                   architektura zinstalowanego pakietu mandrake-release.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
-"użycie:\n"
+"  --virtual      - tworzy nośniki, które są zawsze aktualne,\n"
+"                   dozwolony jest tylko protokół file://.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
-"pobieranie pliku źródłowego hdlist (lub syntezy) związanego z \"%s\"..."
+"  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - wyświetla grupy wraz z ich nazwami.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - czyści katalog nagłówków pamięci podręcznej.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "nośnik \"%s\" nie został wybrany"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - wymusza generację plików hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Tylko administrator ma prawo instalować pakiety"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nie można dodać aktualizacji dystrybucji cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "używając określonego środowiska na %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "pobieranie serwerów pośredniczących z %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nie można znaleźć pliku hdlist dla \"%s\" nośnik zignorowano"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"nie ma potrzeby podawania <ścieżki_względnej lub hdlisty> z opcją --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - mały rozmiar transakcji, domyślna wartość to %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nie można zaktualizować nośnika \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - lewy nawias do otwierania wyrażenia grupowego.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "brak <ścieżki względnej do pliku hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "zbyt dużo punktów montowania dla wymiennego nośnika \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "brakujący parametr \"with\" dla nośnika sieciowego\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operator binarny AND, prawda gdy oba wyrażenia "
-"prawdziwe.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nie można utworzyć nośnika \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"Nie można uzyskać dostępu do nośnika \"%s\",\n"
-"To może się zdarzyć jeśli podczas tworzenia nośnika katalog został "
-"zamontowany ręcznie."
+"użycie: urpmi.removemedia [-a] <nazwa> ...\n"
+"gdzie <nazwa> jest nazwą nośnika do usunięcia.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - wyświetla znacznik group: grupa.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - wybiera wszystkie nośniki.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - używa tylko podanych nośników, rozdzielonych "
-"przecinkami.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "nie można utworzyć transakcji"
+"\n"
+"nieznane opcje \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "pobieranie plików rpm z nośnika \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "brak elementów do usunięcia (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Wybrano pakiet źródłowy:\n"
-"\n"
-"%s\n"
-"\n"
-"Prawdopodobnie nie miałeś/aś ochoty zainstalować go (zainstalowanie go\n"
-"pozwoliłoby na wprowadzenie zmian do kodu źródłowego i skompilowanie go).\n"
-"\n"
-"Co chcesz zrobić?"
+"brak wpisu do usunięcia\n"
+"(jeden z %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "rozpowszechnianie %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"użycie: urpmi.update [opcje] <nazwa> ...\n"
+"gdzie <nazwa> jest nazwą nośnika do aktualizacji.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacja nie powiodła się"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "zapisywanie pliku konfiguracyjnego [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - wymusza aktualizację klucza gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - wybiera wszystkie niewymienne nośniki.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - wyświetla znacznik epoch: iteracja.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacją.\n"
-"                   (--no-verify-rpm wyłącza, domyślnie włączone).\n"
+"brak wpisu do aktualizacji\n"
+"(jeden z %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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"
+"użycie:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Włóż nośnik o nazwie \"%s\" do napędu [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - wypisuje dostępne pakiety.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - tworzy nośnik aktualizacyjny.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - wypisuje dostępne nośniki.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - wypisuje dostępne nośniki i ich url-e.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - wymusza wyszukiwanie niespójności (tak jak --fuzzy).\n"
+"  --dump-config  - zrzuca konfigurację w postaci urpmi.addmedia argument.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - wypisuje dostępne węzły gdy używana jest opcja --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "niepoprawny opis hdlist \"%s\" w pliku hdlist"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases    - wypisuje dostępne równoległe aliasy.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "usuwanie %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - wybiera nagłówki z pakietu wypisane z bazy danych urpmi\n"
+"                   na wyjście standardowe (tylko root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automatycznie tworzy nośnik dla części XXX dystrybucji,\n"
-"                   XXX może mieć wartość main, contrib, updates lub\n"
-"                   cokolwiek innego co zostało skonfigurowane ;-)\n"
+"  --sources      - wypisuje wszystkie pakiety źródłowe przed pobraniem\n"
+"                   (tylko root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - wyświetla znacznik size: rozmiar.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego.\n"
+"                   Ta opcja pozwala na odpytywanie dystrybucji.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "w celu zachowania pakietu %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - wyświetla dziennik zmian.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "z powodu niesatysfakcjonującego pakietu %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - rozszerza zapytania o zależności międzypakietowe.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatyczna instalacja pakietów...\n"
-"Zgłoszono polecenie instalacji pakietu %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "baza danych urpmi jest zablokowana"
+"  -u             - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - wznawia przesyłanie częściowo porabnych plików\n"
-"                   (--no-resume wyłącza funkcję, domyślnie wyłączoną).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - zapełnia wyjście pakietami do usunięcia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - wyszukiwanie odwrotne tego co wymaga pakietu.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
+"  -i             - wyświetla użyteczne informacje w czytelnej formie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "traktowanie napędu wymiennego jako \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - wyświetla grupy wraz z ich nazwami.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Następujący pakiet oprogramowania zostaną zainstalowane na komputerze:\n"
-"\n"
-"%s\n"
-"\n"
-"Być może będziesz mieć ochotę go zapisać. Jaki jest twój wybór?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - wyświetla wersję i wydanie wraz z nazwą.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - wymusza wyszukiwanie niespójności (tak jak -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - wypisuje pliki w pakiecie.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - usuwa pakiet jeśli jest już zainstalowana lepsza wersja.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - próbuje znaleźć i użyć plik hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes może być użyta tylko z opcją --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "z powodu brakującego %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"użycie: urpmi.update [opcje] <nazwa> ...\n"
-"gdzie <nazwa> jest nazwą nośnika do aktualizacji.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "próba przełączenia istniejącego nośnika \"%s\", anulowano"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Jeden z poniższych pakietów musi zostać zainstalowany %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - sprawdza, czy instalacja zostanie przeprowadzona "
-"prawidłowo.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
+#~ "użycie:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Nieznany typ pobierania `%s' !!!\n"
diff --git a/po/pt.po b/po/pt.po
index ea5cf36e..4d7a35f5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-26 21:28+0200\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -45,1992 +45,2037 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "a instalar %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - cria automaticamente todos os médias a partir de\n"
-"                   um média de instalação.\n"
+"Instalação automática de pacotes...\n"
+"Pediu a instalação do pacote %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "impossível abrir o rpmdb"
+msgid "Is this OK?"
+msgstr "Está bem assim?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - mostra esta mensagem de ajuda.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes é necessário para a instalação %s:"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "a remover o pacote %s"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: comando não encontrado\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Não posso utilizar o modo paralelo com o modo use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"uso : %s [opções]\n"
+"onde [opções] estão em\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "já está tudo instalado"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - mostra esta mensagem de ajuda.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpa a pasta cache dos cabeçalhos.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - mostra a marca do grupo: group.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "a utilizar o processo %d para fazer a transacção"
+msgid "                    defaults is %s.\n"
+msgstr "                   por omissão é %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - mostra a marca dos fornecidos: todos os fornecidos.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d)"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nenhum webfetch encontrado, os webfetch suportados são : %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "encontrei %d cabeçalhos no cache"
+msgid "unable to handle protocol: %s"
+msgstr "impossível utilizar o protocolo: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "há vários pacotes com o mesmo nome de ficheiro rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "erro de sintaxe no ficheiro de configuração na linha %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - indica o nome e a senha a utilizar para a\n"
-"       autenticação no proxy (o formato é <nome:senha>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "o média \"%s\" tenta utilizar uma hdlist já usado, vai ser ignorado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "a passar uma segunda vez para calcular as dependências\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"o média \"%s\" tenta usar um ficheiro lista já usado, vou ignorar o média"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "a descarregar o ficheiro rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"impossível de tomar em conta o média \"%s\" pois o ficheiro lista já é usado "
+"por outro média"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases   - lista os aliases paralelos disponíveis.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"impossível de utilizar o nome \"%s\" para o média sem nome porque já está "
+"usado"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...o descarregamento falhou : %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"impossível de tomar o média \"%s\" em conta porque nenhum ficheiro de lista "
+"[%s] existe"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"incapaz de inspectar o ficheiro lista para \"%s\", o média vai ser ignorado"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "impossível de determinar o média do ficheiro hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
-"  -o             - operador binário OU, verdadeiro se uma expressão é "
-"verdadeira.\n"
+"impossível de aceder ao ficheiro hdlist de \"%s\", o média vai ser ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instalação dos pacotes..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr ""
+"impossível de aceder ao ficheiro lista de \"%s\", o média vai ser ignorado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "o nome de ficheiro rpm não é válido [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "a tentar ignorar o média \"%s\", a evitar"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "má declaração do proxy na linha de commando\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"o média virtual \"%s\" não deve ter um hdlist ou uma lista de ficheiros "
+"definida, vou ignorar o média"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transacções de instalação falharam"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "o média virtual \"%s\" deve ter um url limpo, vai ser ignorado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
-"impossível de aceder ao primeiro média de instalação (não achei os ficheiros "
-"Mandrake/base/hdlists)"
+"impossível de encontrar o ficheiro hdlist para \"%s\", o média vai ser "
+"ignorado"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, opção incorrecta, tente de novo\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"impossível de encontrar o ficheiro lista para \"%s\", o média é ignorado"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Escolha onde gravar o ficheiro"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "o ficheiro lista para \"%s\" é incoerente, o média vai ser ignorado"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - mostra a marca do resumo: summary.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr ""
+"incapaz de inspectar o ficheiro lista para \"%s\", o média vai ser ignorado"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes têm %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "há demasiados pontos de montagem para o média amovível \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instalar-lo"
+msgid "taking removable device as \"%s\""
+msgstr "a considerar o dispositivo amovível como \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - utiliza o interface X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "a utilizar um dispositivo amovível diferente [%s] para \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos seguintes pacotes é necessário:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "incapaz de tomar o caminho do média amovível \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Por forma a resolver as dependências, serão apagados os seguintes pacotes (%"
-"d MB)"
+msgid "unable to write config file [%s]"
+msgstr "impossível de escrever o ficheiro de configuração [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - escolhe o melhor interface de acordo com a\n"
-"                   sessão: X ou modo de texto.\n"
+msgid "write config file [%s]"
+msgstr "escreve o ficheiro de configuração [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "A descarregar o pacote %s"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Não posso utilizar o modo paralelo com o modo use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"O que pode ser feito com pacotes de rpm binários quando se utiliza --install-"
-"src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "impossível de encontrar \"%s\" no ficheiro [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
-"sistema.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "a examinar a pegada paralela no ficheiro [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "nenhum pacote se chama %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "encontrei uma pegada paralela para os nodes %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - escolhe todas as correspondências da linha de comando.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "a utilizar o média associado para o modo paralelo : %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"A instalação falhou, faltam alguns ficheiros :\n"
-"%s\n"
-"Talvez queira actualizar a sua base de dados urpmi."
+msgid "unable to use parallel option \"%s\""
+msgstr "impossível de a opção paralela \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"utilização: urpmi.removemedia [-a] <nome> ...\n"
-"onde <nome> é o nome do média a remover\n"
+"--synthesis não pode ser utilizado com --media, --excludemedia, --sortmedia, "
+"-- update ou --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"A instalação não pode continuar pois os seguintes pacotes têm\n"
-"de ser removidos para que outros sejam actualizados:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "a examinar o ficheiro síntese [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "falta `with' para um média rede\n"
+msgid "examining hdlist file [%s]"
+msgstr "a examinar o ficheiro hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista os ficheiros no pacote.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "o média virtual \"%s\" não é local, vai ser ignorado"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pacote desconhecido"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problema ao ler o ficheiro hdlist ou síntese do média \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "A instalação é possível"
+msgid "performing second pass to compute dependencies\n"
+msgstr "a passar uma segunda vez para calcular as dependências\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Os seguintes pacotes têm que ser removidos para que outros sejam "
-"actualizados:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "a saltar o pacote %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Por satisfazer as dependências, serão instalados os %d seguintes pacotes (%d "
-"MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "instalaria no lugar do actualizar o pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"impossível de tomar o média \"%s\" em conta porque nenhum ficheiro de lista "
-"[%s] existe"
+msgid "unable to open rpmdb"
+msgstr "impossível abrir o rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "medium \"%s\" already exists"
+msgstr "o média \"%s\" já existe"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "Não é possível adicionar actualizações duma distribuição cooker\n"
+msgid "virtual medium need to be local"
+msgstr "os médias virtuais devem ser locais"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo detalhado.\n"
+msgid "added medium %s"
+msgstr "adicionei o média %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "A iniciar..."
+msgid "unable to access first installation medium"
+msgstr "impossível de aceder ao primeiro média de instalação"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista os pacotes disponíveis.\n"
+msgid "copying hdlists file..."
+msgstr "a copiar o ficheiro hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - mostra todas as marcas.\n"
+msgid "...copying failed"
+msgstr "...a cópia errou"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "média incoerente \"%s\" marcado como amovível mas não o é de facto"
+msgid "...copying done"
+msgstr "...copia feita"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"o média virtual \"%s\" não deve ter um hdlist ou uma lista de ficheiros "
-"definida, vou ignorar o média"
+"impossível de aceder ao primeiro média de instalação (não achei os ficheiros "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "a calcular o md5sum do hdlist (ou síntese) copiado"
+msgid "retrieving hdlists file..."
+msgstr "a descarregar o ficheiro hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclui os caminhos separados por virgulas.\n"
+msgid "...retrieving done"
+msgstr "...descarregamento feito."
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Prima 'Entrada' quando pronto..."
+msgid "...retrieving failed: %s"
+msgstr "...o descarregamento falhou : %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opções desconhecidas '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descrição hdlist \"%s\" inválida no ficheiro hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - divide em pequenas transacções se vão ser instalados\n"
-"                   ou actualizados mais pacotes do que os indicados,\n"
-"                   por omissão é %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "a tentar seleccionar um média \"%s\" que não existe"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problema ao ler o ficheiro hdlist ou síntese do média \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "a escolher vários médias : %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - utiliza wget para descarregar os ficheiros distantes.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "a remover o média \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - permite a procura em fornecidos para encontrar o pacote.\n"
+"impossível de aceder ao média \"%s\",\n"
+"isto pode acontecer se montou manualmente a directoria quando criou o média."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lista os nós disponíveis quando usa --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"o média virtual \"%s\" deve ter uma fonte correcta hdlist ou síntese, vou "
+"ignorar o média"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "a construir o hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "a copiar o ficheiro de descrição de \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - guarda os pacotes instalados se possível, recusa os\n"
-"                   pacotes pedidos que impedem isso.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "a calcular o md5sum do hdlist (ou síntese) actual"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "a examinar o ficheiro MD5SUM"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comando não encontrado\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "a copiar o hdlist (ou a síntese) de \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "impossível de registar o ficheiro rpm"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "a cópia de [%s] falhou (o ficheiro é suspeitosamente pequeno)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - pergunta ao utilizador se deseja instalar\n"
-"                   os pacotes sem verificar as dependências.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "a calcular o md5sum do hdlist (ou síntese) copiado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "impossível utilizar o protocolo: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "a copia de [%s] falhou (diferença no md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "a descarregar o ficheiro hdlist..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema ao ler o ficheiro de síntese do média \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Sim, instalar-lo mesmo"
+msgid "reading rpm files from [%s]"
+msgstr "o ler os ficheiros rpm de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "adicionei o média %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "incapaz de ler o ficheiros rpm de [%s] : %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mantém na cache os rpm não usados.\n"
+msgid "no rpm files found from [%s]"
+msgstr "nenhum ficheiro rpm encontrado em [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"criei a transacção para instalar em %s (apaga=%d, instala=%d, actualiza=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "a descarregar a fonte hdlist (ou síntese) de \"%s\"..."
+
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "encontrei a hdlist (ou a síntese) testada como %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "a calcular o md5sum do hdlist (ou síntese) descarregado"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "diferença no md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "erro de sintaxe no ficheiro de configuração na linha %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "o descarregamento do hdlist (ou da síntese) falhou"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  os nomes ou ficheiros rpm indicados na linha de comando vão ser "
-"instalados.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "não encontrei um ficheiro hdlist para o média \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - utiliza o proxy HTTP indicado, o numero de porta é\n"
-"               1080 por omissão (o formato é <servidorproxy[:porta]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "o ficheiro [%s] já está utilizado no mesmo média \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "impossível de percorrer o ficheiro hdlist de \"%s\" "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "mudei %s entradas na lista das dependências"
+msgid "unable to write list file of \"%s\""
+msgstr "impossível de escrever o ficheiro lista de \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i            - ignora a diferenças de capitalização.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "a escrever o ficheiro de lista para o média \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Impossível criar a pasta [%s] para relatar o erro"
+msgid "nothing written in list file for \"%s\""
+msgstr "nada de escrito no ficheiro lista para \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "instalaria no lugar do actualizar o pacote %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "a descarregar os servidores espelhos em %s ..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importei a chave %s do ficheiro de chaves públicas de \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - mostra a marca do url : url.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "não pude importar o ficheiro de chaves públicas de \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconhecido definido para %s"
+msgid "reading headers from medium \"%s\""
+msgstr "a ler os cabeçalhos do média \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - mostra a versão e o número com o nome.\n"
+msgid "building hdlist [%s]"
+msgstr "a construir o hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - mostra a marca dos obsoletos : todos os obsoletos.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "construí o ficheiro de síntese hdlist para o média \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "o média \"%s\" já existe"
+msgid "found %d headers in cache"
+msgstr "encontrei %d cabeçalhos no cache"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "a instalar %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "a apagar %d cabeçalhos obsoletos no cache"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada a actualizar está em falta\n"
-"(um de %s)\n"
+msgid "mounting %s"
+msgstr "a montar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "a tentar promover %s"
+msgid "unmounting %s"
+msgstr "a desmontar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "impossível remover o pacote %s"
+msgid "relocated %s entries in depslist"
+msgstr "mudei %s entradas na lista das dependências"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problema ao ler o ficheiro de síntese do média \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "nenhuma entrada mudada na lista das dependências"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada a remover está em falta\n"
-"(um de %s)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "o nome de ficheiro rpm não é válido [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selecciona todos os médias.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "a descarregar o ficheiro rpm [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta a assinatura (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "impossível aceder ao ficheiro rpm [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "incapaz de ler o ficheiros rpm de [%s] : %s"
+msgid "unable to register rpm file"
+msgstr "impossível de registar o ficheiro rpm"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuído através das máquinas do aliás.\n"
+msgid "error registering local packages"
+msgstr "erro ao registar os pacotes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "a cópia de [%s] falhou (o ficheiro é suspeitosamente pequeno)"
+msgid "no package named %s"
+msgstr "nenhum pacote se chama %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - utiliza só os médias de actualização.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes têm %s: %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "há vários pacotes com o mesmo nome de ficheiro rpm \"%s\""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - mostra a marca do grupo: group.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "incapaz de percorrer bem [%s] no valor \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"o média \"%s\" tenta usar um ficheiro lista já usado, vou ignorar o média"
+"o média \"%s\" utiliza uma lista de ficheiros inválida :\n"
+"  o servidor não está provavelmente actualizado, tente utilizar outro método"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "entrada malformada : [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "o média \"%s\" não define nenhum sitio para ficheiros rpm"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "remover o pacote %s vai arruinar o seu sistema"
+msgid "package %s is not found."
+msgstr "o pacote %s não foi encontrado"
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista os média disponíveis.\n"
+msgid "urpmi database locked"
+msgstr "a base de dados urpmi está cerrada"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Alguns pacotes pedidos não podem ser instalados :\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "o média \"%s\" não está selecionado"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "A instalar o pacote `%s' (%s/%s)..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "impossível de ler o ficheiro rpm [%s] do média \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nenhuma entrada mudada na lista das dependências"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "média incoerente \"%s\" marcado como amovível mas não o é de facto"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instala só os pacotes fonte (nenhum binário).\n"
+msgid "unable to access medium \"%s\""
+msgstr "impossível de aceder ao média \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - utiliza o curl para descarregar os ficheiros distantes.\n"
+msgid "malformed input: [%s]"
+msgstr "entrada malformada : [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "a descarregar os ficheiros rpm a partir do média \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "aceita ?"
+msgid "Preparing..."
+msgstr "A preparar..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "o ficheiro lista para \"%s\" é incoerente, o média vai ser ignorado"
+msgid "using process %d for executing transaction"
+msgstr "a utilizar o processo %d para fazer a transacção"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...descarregamento feito."
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"criei a transacção para instalar em %s (apaga=%d, instala=%d, actualiza=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "a adicionar o pacote %s (id=%d, eid=%d, actualiza=%d, ficheiro=%s)"
+msgid "unable to create transaction"
+msgstr "impossível de criar a transacção"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "a saltar o pacote %s"
+msgid "removing package %s"
+msgstr "a remover o pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Assinatura não válida (%s)"
+msgid "unable to remove package %s"
+msgstr "impossível remover o pacote %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  os nomes ou os ficheiros rpm indicados na linha de comando são "
-"interrogados.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "a adicionar o pacote %s (id=%d, eid=%d, actualiza=%d, ficheiro=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versão %s\n"
-"Direitos (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"utilização:\n"
+msgid "unable to install package %s"
+msgstr "impossível instalar o pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "incapaz de percorrer bem [%s] no valor \"%s\""
+msgid "due to missing %s"
+msgstr "devido a faltar %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - não utiliza os média indicados, separados por virgulas.\n"
+msgid "due to unsatisfied %s"
+msgstr "devido a não satisfazer %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "impossível de determinar o média do ficheiro hdlist [%s]"
+msgid "trying to promote %s"
+msgstr "a tentar promover %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "impossível de percorrer o ficheiro hdlist de \"%s\" "
+msgid "in order to keep %s"
+msgstr "para guardar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "o média \"%s\" tenta utilizar uma hdlist já usado, vai ser ignorado"
+msgid "in order to install %s"
+msgstr "para instalar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "devido a conflitos com %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "a apagar %d cabeçalhos obsoletos no cache"
+msgid "unrequested"
+msgstr "não pedido"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "impossível actualizar o média \"%s\"\n"
+msgid "Invalid signature (%s)"
+msgstr "Assinatura não válida (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar a instalação sem verificar dependências? (s/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "ID chave não válida (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "o média virtual \"%s\" não é local, vai ser ignorado"
+msgid "Missing signature (%s)"
+msgstr "Falta a assinatura (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "A preparar..."
+msgid "bad proxy declaration on command line\n"
+msgstr "má declaração do proxy na linha de commando\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                   por omissão é %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: é impossível ler o ficheiro rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "a utilizar um dispositivo amovível diferente [%s] para \"%s\""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, opção incorrecta, tente de novo\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     - não tenta encontrar um ficheiro de\n"
-"                   síntese ou hdlist.\n"
+"urpme versão %s\n"
+"Direitos (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"utilização:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - não procura nos fornecidospara encontrar o pacotes.\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - mostra esta mensagem de ajuda.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "a copia de [%s] falhou (diferença no md5sum)"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - escolhe automaticamente um pacote quando necessário.\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"  --use-distrib  - configura o urpmi para outra fonte.\n"
-"                 isto permite de interrogar uma fonte.\n"
+"  --test         - verifica se a instalação pode ser efectuada "
+"correctamente.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"uso : %s [opções]\n"
-"onde [opções] estão em\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove da cache os rpm antes de começar.\n"
+"  --force        - força a execução mesmo se alguns pacotes não existem.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"impossível de utilizar o nome \"%s\" para o média sem nome porque já está "
-"usado"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuído através das máquinas do aliás.\n"
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts    - mostra a marca dos conflitos : todos os conflitos.\n"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - utiliza outra raíz para instalar os rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"o média virtual \"%s\" deve ter uma fonte correcta hdlist ou síntese, vou "
-"ignorar o média"
+"  --use-distrib  - configura o urpmi para outra fonte, útil\n"
+"         para (des)instalar um chroot com a opção --root.\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versão %s\n"
-"Direitos (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"utilização:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo detalhado.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"utilização : urpmi.addmedia [opções] <nome> <url> [with <caminho_relativo>]\n"
-"onde <url> é do tipo\n"
-"       file://<caminho>\n"
-"       ftp://<nome>:<senha>@<servidor>/<path> with <caminho relativo do "
-"hdlist>\n"
-"       ftp://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
-"       http://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
-"       removable://<caminho>\n"
-"\n"
-"e as [opções] possíveis são\n"
+"  -a             - escolhe todos os pacotes correspondentes à expressão.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "a copiar o hdlist (ou a síntese) de \"%s\"..."
+msgid "unknown packages"
+msgstr "pacotes desconhecidos"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...copia feita"
+msgid "unknown package"
+msgstr "pacote desconhecido"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "impossível de a opção paralela \"%s\""
+msgid "removing package %s will break your system"
+msgstr "remover o pacote %s vai arruinar o seu sistema"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"o média \"%s\" utiliza uma lista de ficheiros inválida :\n"
-"  o servidor não está provavelmente actualizado, tente utilizar outro método"
+msgid "Nothing to remove"
+msgstr "Nada a remover"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "impossível de aceder ao primeiro média de instalação"
+msgid "Checking to remove the following packages"
+msgstr "A verificar para remover os pacotes seguintes"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "os médias virtuais devem ser locais"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Por forma a resolver as dependências, serão apagados os seguintes pacotes (%"
+"d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "erro ao registar os pacotes locais"
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
+msgid "removing %s"
+msgstr "a remover %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "encontrei a hdlist (ou a síntese) testada como %s"
+msgid "Removing failed"
+msgstr "Impossível apagar"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "o descarregamento do hdlist (ou da síntese) falhou"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versão %s\n"
+"Direitos (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"utilização:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nenhum ficheiro rpm encontrado em [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - utiliza só os média de actualização.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nada de escrito no ficheiro lista para \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - utiliza só os média indicados, separados por virgulas.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes têm assinaturas erradas"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - não utiliza os média indicados, separados por virgulas.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "a calcular o md5sum do hdlist (ou síntese) actual"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - organiza os média seguintes as cadeias separadas por "
+"virgulas.\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - listagem completa dos pacotes a remover.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "impossível instalar o pacote %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose      - modo detalhado.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - pergunta ao utilizador se deseja instalar\n"
-"                   os pacotes sem verificar as dependências e integridade.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "Gravar ficheiro"
+"  --quiet         - não mostra o nome da marca (por omissão se nenhuma "
+"marca\n"
+"                   é dada na linha de comando, incompatível com o modo "
+"interactivo).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: é impossível ler o ficheiro rpm \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - não mostra as linhas iguais.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "impossível de escrever o ficheiro de configuração [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - mostra todas as marcas.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - escolhe todos os pacotes correspondentes à expressão.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - mostra a marca do grupo: group.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID chave não válida (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - mostra a marca do tamanho: size.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - força a execução mesmo se alguns pacotes não existem.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - mostra a marca da época: epoch.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de tomar o caminho do média amovível \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - mostra a marca do resumo: summary.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - tenta encontrar e utilizar um ficheiro de síntese.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - mostra a marca da descrição: description.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - mostra a marca sourcerpm: rpm fonte.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - força a actualização da chave gpg.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - mostra a marca packager: autor do pacote.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<caminho relativo de hdlist> em falta\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - mostra a marca buildhost: máquina de compilação.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "A verificar para remover os pacotes seguintes"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - mostra a marca do url : url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "não pedido"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - mostra a marca dos fornecidos: todos os fornecidos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "impossível aceder ao ficheiro rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires     - mostra a marca dos requeridos : todos os requeridos.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 "  --files        - mostra a marca dos ficheiros : todos os ficheiros.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "impossível de encontrar \"%s\" no ficheiro [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Deseja continuar a instalação?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts    - mostra a marca dos conflitos : todos os conflitos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "impossível de ler o ficheiro rpm [%s] do média \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes     - mostra a marca dos obsoletos : todos os obsoletos.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - configura o urpmi para outra fonte, útil\n"
-"         para (des)instalar um chroot com a opção --root.\n"
+"  --env          - utiliza um contexto particular (tipicamente um\n"
+"                   relatório de bug).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "construí o ficheiro de síntese hdlist para o média \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i            - ignora a diferenças de capitalização.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - mostra informações úteis de maneira legível.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - utiliza a versão indicada, por omissão a versão do\n"
-"                   pacote mandrake-release instalado.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - utiliza a url indicada para a lista dos espelhos, por\n"
-"                   omissão é %s\n"
+"  -a             - operador binário E, verdadeiro se as duas expressões são "
+"verdadeiras.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configura o urpmi para outra fonte, útil\n"
-"         para (des)instalar um chroot com a opção --root.\n"
+"  -o             - operador binário OU, verdadeiro se uma expressão é "
+"verdadeira.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operador unário NÃO, verdadeiro se a expressão é falsa.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - parêntesis esquerdo para abrir um grupo de expressões.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - parêntesis direito para fechar um grupo de expressões.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr "A pasta [%s] já existe, utilize por favor outra pasta ou apague-at"
+"callback is :\n"
+"%s\n"
+msgstr ""
+"a chamada de retorno é :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "a desmontar %s"
+msgid "using specific environment on %s\n"
+msgstr "utilizando o ambiente especificado em %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada a actualizar (use urpmi.addmedia para adicionar um media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% completado, velocidade = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versão %s\n"
+"Direitos (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"utilização:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "reinicio do urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "a examinar o ficheiro síntese [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
+"sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar a instalação de forma mais insistente (--force)? (s/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nunca propõe de apagar um pacote, pára a instalação.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...a cópia errou"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - guarda os pacotes instalados se possível, recusa os\n"
+"                   pacotes pedidos que impedem isso.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"impossível de aceder ao ficheiro hdlist de \"%s\", o média vai ser ignorado"
+"  --split-level  - divide em pequenas transacções se vão ser instalados\n"
+"                   ou actualizados mais pacotes do que os indicados,\n"
+"                   por omissão é %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - tamanho das transacções pequenas, por omissão %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose      - modo detalhado.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impõe uma procura aproximada (o mesmo que -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - indica todos os pacotes a instalar antes de os "
-"descarregar (se root).\n"
+"  --src          - o próximo pacote e um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - extrai os cabeçalhos dos pacotes listados a partir da\n"
-"                   base de dados urpmi para stdout (só root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instala só os pacotes fonte (nenhum binário).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pacotes desconhecidos"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove da cache os rpm antes de começar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "a escolher vários médias : %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mantém na cache os rpm não usados.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - mostra a versão, o numero e a arquitectura com o nome.\n"
+"  --allow-nodeps - pergunta ao utilizador se deseja instalar\n"
+"                   os pacotes sem verificar as dependências.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "o ficheiro [%s] já está utilizado no mesmo média \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - pergunta ao utilizador se deseja instalar\n"
+"                   os pacotes sem verificar as dependências e integridade.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configura o urpmi para outra fonte, útil\n"
+"         para (des)instalar um chroot com a opção --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"impossível de encontrar o ficheiro lista para \"%s\", o média é ignorado"
+"  --wget         - utiliza wget para descarregar os ficheiros distantes.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - mostra esta mensagem de ajuda.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - utiliza o curl para descarregar os ficheiros distantes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "encontrei uma pegada paralela para os nodes %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita a velocidade de descarga.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"a chamada de retorno é :\n"
-"%s\n"
+"  --resume       - continua a transferência dos ficheiros descarregados por "
+"parte\n"
+"                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverte a procura para o que requer o pacote.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - utiliza o proxy HTTP indicado, o numero de porta é\n"
+"               1080 por omissão (o formato é <servidorproxy[:porta]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versão %s\n"
-"Direitos (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"utilização:\n"
+"  --proxy-user   - indica o nome e a senha a utilizar para a\n"
+"       autenticação no proxy (o formato é <nome:senha>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - não mostra o nome da marca (por omissão se nenhuma "
-"marca\n"
-"                   é dada na linha de comando, incompatível com o modo "
-"interactivo).\n"
+"  --bug          - escreve um resumo de erro na pasta indicada\n"
+"                   no parametro seguinte.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - não mostra as linhas iguais.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - utiliza o interface X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis não pode ser utilizado com --media, --excludemedia, --sortmedia, "
-"-- update ou --parallel"
+"  --best-output  - escolhe o melhor interface de acordo com a\n"
+"                   sessão: X ou modo de texto.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - utiliza a arquitectura indicada, por omissão a arch\n"
-"                   do pacote mandrake-release instalado.\n"
+"  --verify-rpm   - verifica a assinatura do rpm antes de instalar.\n"
+"                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Está bem assim?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclui os caminhos separados por virgulas.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclui os ficheiros de documentação.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - usa a síntese indicada no lugar da bdd urpmi.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - escolhe todas as correspondências da linha de comando.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "a examinar a pegada paralela no ficheiro [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - permite a procura em fornecidos para encontrar o pacote.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nada a remover"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - não procura nos fornecidospara encontrar o pacotes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importei a chave %s do ficheiro de chaves públicas de \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "a ler os cabeçalhos do média \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - alarga a procura às dependências dos pacotes.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - escreve um resumo de erro na pasta indicada\n"
-"                   no parametro seguinte.\n"
+"  os nomes ou ficheiros rpm indicados na linha de comando vão ser "
+"instalados.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "o média \"%s\" não define nenhum sitio para ficheiros rpm"
+msgid "Choose location to save file"
+msgstr "Escolha onde gravar o ficheiro"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - mostra a marca sourcerpm: rpm fonte.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"O que pode ser feito com pacotes de rpm binários quando se utiliza --install-"
+"src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "impossível de escrever o ficheiro lista de \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Você escolheu um pacote fonte :\n"
+"\n"
+"%s\n"
+"\n"
+"Você não queria provavelmente instalar-lo no seu computador (isso\n"
+"vai permitir-lhe de mudar o código fonte e de o compilar).\n"
+"\n"
+"Que deseja fazer ?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr ""
-"  --requires     - mostra a marca dos requeridos : todos os requeridos.\n"
+msgid "Do nothing"
+msgstr "Não fazer nada"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "a tentar seleccionar um média \"%s\" que não existe"
+msgid "Yes, really install it"
+msgstr "Sim, instalar-lo mesmo"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - mostra a marca da descrição: description.\n"
+msgid "Save file"
+msgstr "Gravar ficheiro"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "A cópia errou"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Você vai instalar o pacote de programas seguinte no seu computador :\n"
+"\n"
+"%s\n"
+"\n"
+"Pode preferir só o gravar. Que escolhe ?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - força a criação dos ficheiros hdlist.\n"
+msgid "Install it"
+msgstr "Instalar-lo"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes só pode ser utilizado com --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr "A pasta [%s] já existe, utilize por favor outra pasta ou apague-at"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "não encontrei um ficheiro hdlist para o média \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Impossível criar a pasta [%s] para relatar o erro"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgid "Copying failed"
+msgstr "A cópia errou"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "a instalar %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas o superutilizador pode instalar pacotes"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "o ler os ficheiros rpm de [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Um dos seguintes pacotes é necessário:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "a copiar o ficheiro de descrição de \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - escolhe automaticamente um pacote quando necessário.\n"
+msgid "Package installation..."
+msgstr "Instalação dos pacotes..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Impossível apagar"
+msgid "Initializing..."
+msgstr "A iniciar..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - cria um média virtual que está ser actualizado,\n"
-"                   só é permitido o protocolo file://\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "o pacote %s não foi encontrado"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "a remover o média \"%s\""
+"Alguns pacotes pedidos não podem ser instalados :\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "não é preciso indicar o <caminho relativo para hdlist> com --distrib"
+msgid "do you agree ?"
+msgstr "aceita ?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"A instalação não pode continuar pois os seguintes pacotes têm\n"
+"de ser removidos para que outros sejam actualizados:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - o próximo pacote e um pacote fonte (o mesmo que -s).\n"
+"Os seguintes pacotes têm que ser removidos para que outros sejam "
+"actualizados:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - utiliza um contexto particular (tipicamente um\n"
-"                   relatório de bug).\n"
+"Por satisfazer as dependências, serão instalados os %d seguintes pacotes (%d "
+"MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - organiza os média seguintes as cadeias separadas por "
-"virgulas.\n"
+"Necessita ser root para instalar as dependências seguintes : \n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "impossível de aceder ao média \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "impossível obter pacotes fonte, a interromper"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "impossível criar o média \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Por favor insira o media com o nome \"%s\" no dispositivo [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - mostra a marca packager: autor do pacote.\n"
+msgid "Press Enter when ready..."
+msgstr "Prima 'Entrada' quando pronto..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - mostra a configuração na forma de parâmetros para urpmi."
-"addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "A descarregar o pacote %s"
 
-#: ../urpmi:1
+#: ../urpmi:597
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"Necessita ser root para instalar as dependências seguintes : \n"
-"%s\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - mostra as mudanças.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% completado, velocidade = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"impossível de aceder ao ficheiro lista de \"%s\", o média vai ser ignorado"
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes têm assinaturas erradas"
 
-#: ../urpmf:1
+#: ../urpmi:620
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Deseja continuar a instalação?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  )              - parêntesis direito para fechar um grupo de expressões.\n"
+"A instalação falhou, faltam alguns ficheiros :\n"
+"%s\n"
+"Talvez queira actualizar a sua base de dados urpmi."
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nenhum webfetch encontrado, os webfetch suportados são : %s\n"
+msgid "Installation failed"
+msgstr "A instalação falhou"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "a examinar o ficheiro hdlist [%s]"
+msgid "distributing %s"
+msgstr "a distribuir %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "copying hdlists file..."
-msgstr "a copiar o ficheiro hdlist..."
+msgid "installing %s"
+msgstr "a instalar %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "a escrever o ficheiro de lista para o média \"%s\""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "A instalar o pacote `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "o média virtual \"%s\" deve ter um url limpo, vai ser ignorado"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar a instalação sem verificar dependências? (s/N) "
 
-#: ../urpmf:1
+#: ../urpmi:731
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - mostra a marca buildhost: máquina de compilação.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar a instalação de forma mais insistente (--force)? (s/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "Do nothing"
-msgstr "Não fazer nada"
+msgid "%d installation transactions failed"
+msgstr "%d transacções de instalação falharam"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "a utilizar o média associado para o modo paralelo : %s"
+msgid "Installation is possible"
+msgstr "A instalação é possível"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "mounting %s"
-msgstr "a montar %s"
+msgid "Everything already installed"
+msgstr "já está tudo instalado"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr "reinicio do urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"impossível de tomar em conta o média \"%s\" pois o ficheiro lista já é usado "
-"por outro média"
+"utilização : urpmi.addmedia [opções] <nome> <url> [with <caminho_relativo>]\n"
+"onde <url> é do tipo\n"
+"       file://<caminho>\n"
+"       ftp://<nome>:<senha>@<servidor>/<path> with <caminho relativo do "
+"hdlist>\n"
+"       ftp://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
+"       http://<servidor>/<caminho> with <caminho relativo do hdlist>\n"
+"       removable://<caminho>\n"
+"\n"
+"e as [opções] possíveis são\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "impossível obter pacotes fonte, a interromper"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cria um média de actualização.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - utiliza outra raíz para instalar os rpm.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - tenta encontrar e utilizar um ficheiro de síntese.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% de %s completados, FIM = %s, velocidade = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - tenta encontrar e utilizar um ficheiro hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "a calcular o md5sum do hdlist (ou síntese) descarregado"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - não tenta encontrar um ficheiro de\n"
+"                   síntese ou hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "não pude importar o ficheiro de chaves públicas de \"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - cria automaticamente todos os médias a partir de\n"
+"                   um média de instalação.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --no-uninstall - nunca propõe de apagar um pacote, pára a instalação.\n"
+"  --distrib-XXX  - cria automaticamente o média XXX duma distribuição,\n"
+"                   XXX pode ser main, contrib, updates ou qualquer outro\n"
+"                   que tenha sido configurado ;-)\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"urpmq versão %s\n"
-"Direitos (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"utilização:\n"
+"  --from         - utiliza a url indicada para a lista dos espelhos, por\n"
+"                   omissão é %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "a descarregar a fonte hdlist (ou síntese) de \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - utiliza a versão indicada, por omissão a versão do\n"
+"                   pacote mandrake-release instalado.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - indica o grupo com o nome.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - utiliza a arquitectura indicada, por omissão a arch\n"
+"                   do pacote mandrake-release instalado.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "o média \"%s\" não está selecionado"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - cria um média virtual que está ser actualizado,\n"
+"                   só é permitido o protocolo file://\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas o superutilizador pode instalar pacotes"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - não testa o MD5SUM dos ficheiros.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "utilizando o ambiente especificado em %s\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpa a pasta cache dos cabeçalhos.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"impossível de encontrar o ficheiro hdlist para \"%s\", o média vai ser "
-"ignorado"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - força a criação dos ficheiros hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - tamanho das transacções pequenas, por omissão %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "Não é possível adicionar actualizações duma distribuição cooker\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - parêntesis esquerdo para abrir um grupo de expressões.\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "a descarregar os servidores espelhos em %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "há demasiados pontos de montagem para o média amovível \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "não é preciso indicar o <caminho relativo para hdlist> com --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operador binário E, verdadeiro se as duas expressões são "
-"verdadeiras.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "impossível actualizar o média \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"impossível de aceder ao média \"%s\",\n"
-"isto pode acontecer se montou manualmente a directoria quando criou o média."
+msgid "<relative path of hdlist> missing\n"
+msgstr "<caminho relativo de hdlist> em falta\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - mostra a marca do grupo: group.\n"
+msgid "`with' missing for network media\n"
+msgstr "falta `with' para um média rede\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - utiliza só os média indicados, separados por virgulas.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "impossível criar o média \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
-msgstr "impossível de criar a transacção"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"utilização: urpmi.removemedia [-a] <nome> ...\n"
+"onde <nome> é o nome do média a remover\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "a descarregar os ficheiros rpm a partir do média \"%s\"..."
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selecciona todos os médias.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
-"Você escolheu um pacote fonte :\n"
-"\n"
-"%s\n"
-"\n"
-"Você não queria provavelmente instalar-lo no seu computador (isso\n"
-"vai permitir-lhe de mudar o código fonte e de o compilar).\n"
 "\n"
-"Que deseja fazer ?"
+"opções desconhecidas '%s'\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "a distribuir %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada a remover (use urpmi.addmedia para adicionar media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "A instalação falhou"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"a entrada a remover está em falta\n"
+"(um de %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "escreve o ficheiro de configuração [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"utilização: urpmi.update [opções] <nome> ...\n"
+"onde <nome> é o nome do média a actualizar.\n"
+
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - utiliza só os médias de actualização.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - força a actualização da chave gpg.\n"
+
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selecciona todos os médias não amovíveis.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - mostra a marca da época: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada a actualizar (use urpmi.addmedia para adicionar um media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifica a assinatura do rpm antes de instalar.\n"
-"                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
+"a entrada a actualizar está em falta\n"
+"(um de %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versão %s\n"
+"Direitos (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"utilização:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Por favor insira o media com o nome \"%s\" no dispositivo [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista os pacotes disponíveis.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria um média de actualização.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista os média disponíveis.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista os média disponíveis com os seus endereços.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+"  --dump-config  - mostra a configuração na forma de parâmetros para urpmi."
+"addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - lista os nós disponíveis quando usa --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descrição hdlist \"%s\" inválida no ficheiro hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases   - lista os aliases paralelos disponíveis.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "a remover %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extrai os cabeçalhos dos pacotes listados a partir da\n"
+"                   base de dados urpmi para stdout (só root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - cria automaticamente o média XXX duma distribuição,\n"
-"                   XXX pode ser main, contrib, updates ou qualquer outro\n"
-"                   que tenha sido configurado ;-)\n"
+"  --sources      - indica todos os pacotes a instalar antes de os "
+"descarregar (se root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - mostra a marca do tamanho: size.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - configura o urpmi para outra fonte.\n"
+"                 isto permite de interrogar uma fonte.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "para guardar %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - mostra as mudanças.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a não satisfazer %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - alarga a procura às dependências dos pacotes.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Instalação automática de pacotes...\n"
-"Pediu a instalação do pacote %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "a base de dados urpmi está cerrada"
+"  -u             - remove o pacote se uma versão mais recente já está "
+"instalada.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - continua a transferência dos ficheiros descarregados por "
-"parte\n"
-"                   (--no-verify-rpm desactiva isto, activo por omissão).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - listagem completa dos pacotes a remover.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverte a procura para o que requer o pacote.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - não testa o MD5SUM dos ficheiros.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - mostra informações úteis de maneira legível.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "a considerar o dispositivo amovível como \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - indica o grupo com o nome.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Você vai instalar o pacote de programas seguinte no seu computador :\n"
-"\n"
-"%s\n"
-"\n"
-"Pode preferir só o gravar. Que escolhe ?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - mostra a versão e o número com o nome.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impõe uma procura aproximada (o mesmo que -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista os ficheiros no pacote.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - remove o pacote se uma versão mais recente já está "
-"instalada.\n"
+"  os nomes ou os ficheiros rpm indicados na linha de comando são "
+"interrogados.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - tenta encontrar e utilizar um ficheiro hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes só pode ser utilizado com --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "devido a faltar %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - utiliza só os média de actualização.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"utilização: urpmi.update [opções] <nome> ...\n"
-"onde <nome> é o nome do média a actualizar.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "a tentar ignorar o média \"%s\", a evitar"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Um dos seguintes pacotes é necessário para a instalação %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifica se a instalação pode ser efectuada "
-"correctamente.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versão %s\n"
+#~ "Direitos (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Este programa é livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+#~ "\n"
+#~ "utilização:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Descarregador desconhecido `%s' !!!\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c773322c..6802e1d4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-06 00:55+0200\n"
 "Last-Translator: Carlinhos Cecconi <carlinu@terra.com.br>\n"
 "Language-Team: Português Brasileiro <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -43,875 +43,774 @@ msgstr "SsYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalando %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automaticamente cria todas as mídias a partir de uma "
-"mídia\n"
-"                   de instalação.\n"
+"Instalação automática de pacotes...\n"
+"Você pediu a instalação do pacote %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "incapaz de abrir rpmdb"
+msgid "Is this OK?"
+msgstr "Tudo bem?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - imprime esta mensagem de ajuda.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Um dos seguintes pacotes é necessário para instalação %s:"
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "removendo pacote %s"
+msgid " (Y/n) "
+msgstr " (S/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: comando não encontrado\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Não pode usar o modo paralelo com modo 'use-distrib'"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "tudo já está instalado"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - imprime esta mensagem de ajuda.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - limpa o diretório dos cabeçalhos de cache.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - imprime a tag 'group': group. \n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using process %d for executing transaction"
-msgstr "utilizando processo %d para executar a transação"
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - lista os arquivos do pacote.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - imprime a tag 'provides': lista todos os que provê.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocolo desconhecido definido para %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Qual é a sua escolha? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "Encontrado %d cabeçalhos no cache."
+msgid "unable to handle protocol: %s"
+msgstr "Incapaz de usar protocolo: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "Existem múltiplos pacotes com o mesmo nome rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "Erro de sintaxe no arquivo de configuração na linha %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - especifica usuário e senha para usar na autenticação\n"
-"                   do proxy (o formato é <usuário:senha>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "Mídia \"%s\" tentou usar um 'hdlist' já usada, mídia ignorada."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "fazendo segundo passo para calcular dependências\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "mídia \"%s\" tentou usar uma lista já usada, mídia ignorada."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Adquirindo o arquivo rpm [%s]...."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"Incapaz de lidar com a mídia \"%s\" porque o arquivo está sendo usado por "
+"outra mídia"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lista os apelidos paralelos disponíveis\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"incapaz de usar o nome \"%s\" para mídia não-nomeada, porque já está em uso."
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "   A aquisição falhou: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"incapaz de usar a mídia \"%s\" porque nenhum arquivo da lista [%s] existe."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "incapaz de inspecionar a lista de arquivos \"%s\", mídia ignorada"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "incapaz de determinar a mídia deste arquivo 'hdlist' [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operador binário 'OU', verdadeiro se uma expressão for\n"
-"                   verdadeira.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "incapaz de acessar a arquivo 'hdlist' de \"%s\", mídia ignorada"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instalação de pacotes..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "incapaz de acessar a lista de arquivos de \"%s\", mídia ignorada."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "Nome rpm inválido [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "Tentando contornar mídia existente \"%s\", evitando"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declaração de proxy errada na linha de comando\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"Mídia Virtual \"%s\" não contém o arquivo 'hdlist' ou lista de arquivos; "
+"mídia ignorada."
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalação falhou"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "mídia virtual \"%s\" precisa ter uma url limpa, mídia ignorada."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"incapaz de acessar a primeira mídia de instalação (não encontrado o arquivo "
-"Mandrake/base/hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "Incapaz de encontrar arquivo 'hdlist' para \"%s\", mídia ignorada."
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Desculpe, má escolha, tente novamente\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "incapaz de encontrar a lista para \"%s\", mídia ignorada."
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Escolha o local para salvar o arquivo"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Lista de arquivos incoerente para \"%s\", mídia ignorada"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - imprime a tag 'summary': sumário do pacote.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "incapaz de inspecionar a lista de arquivos \"%s\", mídia ignorada"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes contém %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "muitos pontos de montagem para a mídia removível \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instalar"
+msgid "taking removable device as \"%s\""
+msgstr "Pegando dispositivos removíveis como \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - usa  a interface X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Usando diferentes dispositivos removíveis [%s] para \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Um dos pacotes a seguir é necessário:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "incapaz de adquirir caminhos para mídia removível \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Para satisfazer as dependências, os seguintes pacotes serão removidos (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "incapaz de gravar o arquivo de configuração [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - escolhe a melhor interface de acordo com o ambiente:\n"
-"                   X ou modo texto.\n"
+msgid "write config file [%s]"
+msgstr "grava o arquivo de configuração [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Baixando o pacote `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Não pode usar o modo paralelo com modo 'use-distrib'"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-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"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "incapaz de processar \"%s\" no arquivo [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automaticamente seleciona os pacotes necessários para \n"
-"                   atualizar o sistema.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "examinando aquisição em paralelo no arquivo [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "Nenhum nome de pacote %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "Encontrada aquisição em paralelo com os nós: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - seleciona todos os listados na linha de comando.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "usando a mídia associada para o modo paralelo: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalação falhou, alguns arquivos estão faltando:.\n"
-"%s\n"
-"Você deve atualizar a sua base de dados urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "incapaz de usar a opção paralela \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"uso: urpmi.removemedia [-a] <nome> ...\n"
-"onde <nome> é um nome de mídia para remover.\n"
+"--synthesis não pode ser usada com --media, -excludemedia, -sortmedia, --"
+"update ou --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"A instalação não pode continuar porque os seguitens pacotes\n"
-"precisam ser removidos para que os outros possam ser atualizados:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "Examinando arquivo de síntese [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' faltando para mídia da rede\n"
+msgid "examining hdlist file [%s]"
+msgstr "Examinando arquivo 'hdlist' [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista os arquivos do pacote.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "mídia virtual \"%s\" não é local, mídia ignorada"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pacote desconhecido."
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Problema lendo arquivo hdlist ou síntese da mídia \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalação é possível"
+msgid "performing second pass to compute dependencies\n"
+msgstr "fazendo segundo passo para calcular dependências\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "pulando o pacote %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Para satisfazer as dependências, os seguintes %d pacotes serão instalados (%"
-"d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "é necessário instalar ao invés de atualizar o pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"incapaz de usar a mídia \"%s\" porque nenhum arquivo da lista [%s] existe."
+msgid "unable to open rpmdb"
+msgstr "incapaz de abrir rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
+msgid "medium \"%s\" already exists"
+msgstr "Mídia \"%s\" já existe"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "não foi possível adicionar atualizações de uma distribuição 'cooker'\n"
+msgid "virtual medium need to be local"
+msgstr "mídia virtual precisa ser local"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - modo de detalhe.\n"
+msgid "added medium %s"
+msgstr "Mídia adicionada %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Iniciando..."
+msgid "unable to access first installation medium"
+msgstr "incapaz de acessar a primeira mídia de instalação."
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - lista os pacotes disponíveis.\n"
+msgid "copying hdlists file..."
+msgstr "Copiando arquivo 'hdlist'..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - imprime todas as tags\n"
+msgid "...copying failed"
+msgstr "...falha na cópia"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "Mídia incoerente \"%s\" marcada como removível, porém não é."
+msgid "...copying done"
+msgstr "..cópia terminada"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"Mídia Virtual \"%s\" não contém o arquivo 'hdlist' ou lista de arquivos; "
-"mídia ignorada."
+"incapaz de acessar a primeira mídia de instalação (não encontrado o arquivo "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "computando o md5sum de uma fonte 'hdlist' copiada (ou síntese)"
+msgid "retrieving hdlists file..."
+msgstr "Adquirindo arquivo 'hdlist'..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclui o(s) caminho(s), separados por vírgula.\n"
+msgid "...retrieving done"
+msgstr "..aquisição completa"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Aperte enter quando estiver pronto..."
+msgid "...retrieving failed: %s"
+msgstr "   A aquisição falhou: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"Opcões desconhecidas '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descrição inválida \"%s\" no arquivo 'hdlists'"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - divide em pequenas transações se mais de um pacote\n"
-"                   precisa ser instalado ou atualizado,\n"
-"                   o padrão é %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "tentando selecionar mídia inexistente \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "Problema lendo arquivo hdlist ou síntese da mídia \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "selecionando múltiplas mídias: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - usa wget para adquirir arquivos distantes.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - permite a busca em 'provides' para achar o pacote.\n"
+msgid "removing medium \"%s\""
+msgstr "removendo a mídia \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - lista os nós disponíveis quando  --parallel é usada.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "Construindo 'hdlist' [%s]"
+"incapaz de acessar a mídia \"%s\",\n"
+"verifique se não é necessário montar manualmente o diretório no qual ela foi "
+"criada."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - mantém os pacotes existentes se possível, recusando os\n"
-"                   pacotes solicitados que pedem a remoção do pacote.\n"
+"Mídia \"%s\" a fonte fornecida não é válida ('hdlist' ou 'synthesis'), mídia "
+"ignorada."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "Examinando arquivo MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "Copiando o arquivo de descrição de \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comando não encontrado\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "computando o md5sum de uma fonte 'hdlist' existente (ou síntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "incapaz de registrar arquivo rpm"
+msgid "examining MD5SUM file"
+msgstr "Examinando arquivo MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permite ao usuário instalar pacotes sem \n"
-"                   checagem de dependências.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copiando fonte 'hdlist' (ou síntese) de \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "Incapaz de usar protocolo: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "Adquirindo arquivo 'hdlist'..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "computando o md5sum de uma fonte 'hdlist' copiada (ou síntese)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Sim, instalar realmente"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "cópia de [%s] falhou (md5sum não é igual)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "Mídia adicionada %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Problema ao ler arquivo síntese da mídia \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mantém o rpm não usado no cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "lendo arquivos rpms de [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "incapaz de ler os arquivos rpm de: [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "assinatura md5sum diferente"
+msgid "no rpm files found from [%s]"
+msgstr "nenhum arquivo rpm encontrado em [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "Erro de sintaxe no arquivo de configuração na linha %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "Adquirindo a fonte 'hdlist' (ou a síntese) de \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  nomes ou arquivos rpm dados na linha de comando serão instalados.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "encontrado 'hdlist' (ou síntese) em %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - usa o proxy HTTP especificado, o número da porta\n"
-"                   é 1080 por padrão (o formato é <máquinaproxy[:porta]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "computando o md5sum de uma fonte 'hdlist' recuperada (ou síntese)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
+msgid "md5sum mismatch"
+msgstr "assinatura md5sum diferente"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "entradas %s realocadas na depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "Aquisição da fonte hdlist (ou síntese) falhou"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "Nenhum arquivo 'hdlist' encontrado para a mídia \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "arquivo [%s] já está em uso na mesma mídia \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "é necessário instalar ao invés de atualizar o pacote %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "incapaz de atualizar o arquivo hdlist de \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "pegando os espelhos em %s...."
+msgid "unable to write list file of \"%s\""
+msgstr "incapaz de gravar lista de arquivos de \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - imprime a tag 'url': url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "Gravando a lista de arquivos para a mídia \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocolo desconhecido definido para %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "Nada escrito na lista para \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - imprime versão e 'release' com nome também.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "examinando arquivo de chave pública em \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - imprime a tag 'obsoletes': lista todos os obsoletos.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "Mídia \"%s\" já existe"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "incapaz de importar arquivo de chave pública de \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instalando %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "Lendo cabeçalhos da mídia \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada a ser atualizada está faltando\n"
-"(uma de %s)\n"
+msgid "building hdlist [%s]"
+msgstr "Construindo 'hdlist' [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "tentando promover %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "Construindo arquivo de síntese de 'hdlist' para mídia \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "incapaz de remover o pacote %s"
+msgid "found %d headers in cache"
+msgstr "Encontrado %d cabeçalhos no cache."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Problema ao ler arquivo síntese da mídia \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "Removendo %d cabeçalhos obsoletos no cache."
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"a entrada para remover está faltando\n"
-"(um de %s)\n"
+msgid "mounting %s"
+msgstr "Montando %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - seleciona todas as mídias.\n"
+msgid "unmounting %s"
+msgstr "Desmontando %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Assinatura não encontrada (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "entradas %s realocadas na depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "incapaz de ler os arquivos rpm de: [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "Nenhuma entrada realocada em depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuído.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "Nome rpm inválido [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "Adquirindo o arquivo rpm [%s]...."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - atualize somente a mídia de atualizações.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "incapaz de acessar o arquivo rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (S/n) "
+msgid "unable to register rpm file"
+msgstr "incapaz de registrar arquivo rpm"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - imprime a tag 'group': group. \n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "Erro ao registrar pacotes locais"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "mídia \"%s\" tentou usar uma lista já usada, mídia ignorada."
+msgid "no package named %s"
+msgstr "Nenhum nome de pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "Entrada mal construída: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes contém %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "a remoção do pacote %s irá danificar seu sistema"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "Existem múltiplos pacotes com o mesmo nome rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - lista as mídias disponíveis\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "incapaz de ler corretamente [%s] no valor \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Alguns pacotes não puderam ser instalados:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalando pacote `%s' (%s/%s)..."
+"a mídia \"%s\" usa uma lista de arquivos inválida:\n"
+"  o espelho provavelmente não está atualizado, tente usando métodos "
+"alternativos"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "Nenhuma entrada realocada em depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "a mídia \"%s\" não define uma localização para arquivos rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - instala somente o pacote de fontes (sem binários).\n"
+msgid "package %s is not found."
+msgstr "o pacote %s não foi encontrado."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - usa curl para adquirir arquivos distantes.\n"
+msgid "urpmi database locked"
+msgstr "Base de dados urpmi travada."
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-"  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "Mídia \"%s\" não está selecionada"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Você aceita?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "incapaz de ler o arquivo rpm [%s] para a mídia \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Lista de arquivos incoerente para \"%s\", mídia ignorada"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "Mídia incoerente \"%s\" marcada como removível, porém não é."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "..aquisição completa"
+msgid "unable to access medium \"%s\""
+msgstr "incapaz de acessar a mídia \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "adicionando pacote %s (id=%d, eid=%d, atualização=%d, arquivo=%s)"
+msgid "malformed input: [%s]"
+msgstr "Entrada mal construída: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "pulando o pacote %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "Adquirindo os arquivos rpm da mídia \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Assinatura inválida (%s)"
+msgid "Preparing..."
+msgstr "Preparando..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-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"
+msgid "using process %d for executing transaction"
+msgstr "utilizando processo %d para executar a transação"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versão %s\n"
-"Copyright (C) 1999 - 2003 MandrakeSoft.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "incapaz de ler corretamente [%s] no valor \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - não usa a mídia fornecida (separadas por vírgulas).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "incapaz de determinar a mídia deste arquivo 'hdlist' [%s]"
+"transação criada para instalar %s (remover=%d, instalar=%d, atualizar=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "incapaz de atualizar o arquivo hdlist de \"%s\""
+msgid "unable to create transaction"
+msgstr "incapaz de criar a transação"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "Mídia \"%s\" tentou usar um 'hdlist' já usada, mídia ignorada."
+msgid "removing package %s"
+msgstr "removendo pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "devido a conflitos com %s"
+msgid "unable to remove package %s"
+msgstr "incapaz de remover o pacote %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Removendo %d cabeçalhos obsoletos no cache."
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "adicionando pacote %s (id=%d, eid=%d, atualização=%d, arquivo=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "incapaz de atualizar mídia \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "incapaz de instalar o pacote %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tentar instalar sem checar as dependências? (s/N) "
+msgid "due to missing %s"
+msgstr "devido estar faltando %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "mídia virtual \"%s\" não é local, mídia ignorada"
+msgid "due to unsatisfied %s"
+msgstr "devido a não satisfazer %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Preparando..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - lista os arquivos do pacote.\n"
+msgid "trying to promote %s"
+msgstr "tentando promover %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Usando diferentes dispositivos removíveis [%s] para \"%s\""
+msgid "in order to keep %s"
+msgstr "para continuar %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - não tentar procurar qualquer arquivo de síntese\n"
-"                   ou arquivo 'hdlist'.\n"
+msgid "in order to install %s"
+msgstr "para instalar %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - não procure em 'provides' para encontrar o pacote.\n"
+msgid "due to conflicts with %s"
+msgstr "devido a conflitos com %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "cópia de [%s] falhou (md5sum não é igual)"
+msgid "unrequested"
+msgstr "não requisitado"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - configura o urpmi por meio de uma árvore de\n"
-"                   distribuição. Isso permite consultar essa\n"
-"                   distribuição.\n"
+msgid "Invalid signature (%s)"
+msgstr "Assinatura inválida (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Chave Inválida ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove os rpm do cache antes de iniciar.\n"
+msgid "Missing signature (%s)"
+msgstr "Assinatura não encontrada (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"incapaz de usar o nome \"%s\" para mídia não-nomeada, porque já está em uso."
+msgid "bad proxy declaration on command line\n"
+msgstr "declaração de proxy errada na linha de comando\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts    - imprime a tag 'conflicts': lista todos os conflitantes.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"Mídia \"%s\" a fonte fornecida não é válida ('hdlist' ou 'synthesis'), mídia "
-"ignorada."
+msgid "Sorry, bad choice, try again\n"
+msgstr "Desculpe, má escolha, tente novamente\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -928,1100 +827,1247 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - imprime esta mensagem de ajuda.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"uso: urpmi.addmedia [opções] <nome> <url> [with <caminho_relativo>]\n"
-"onde <url> é um entre:\n"
-"       file://<caminho_para_arquivo>\n"
-"       ftp://<login>:<senha>@<máquina>/<caminho> with "
-"<nome_relativo_de_hdlist>\n"
-"       ftp://<máquina>/<caminho> with <nome_relativo_de_hdlist>\n"
-"       http://<máquina>/<caminho> with <nome_relativo_de_hdlist>\n"
-"       removable://<caminho>\n"
-"\n"
-"e [opções] são\n"
+"  --test         - verifica se a instalação pode ser efetuada corretamente.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copiando fonte 'hdlist' (ou síntese) de \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - força mesmo se alguns pacotes não existem.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "..cópia terminada"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuído.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "incapaz de usar a opção paralela \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - use outro root para instalação rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"a mídia \"%s\" usa uma lista de arquivos inválida:\n"
-"  o espelho provavelmente não está atualizado, tente usando métodos "
-"alternativos"
+"  --use-distrib  - configura o urpmi por meio de uma árvore de distribuição\n"
+"                   padrão, útil para (des)instalar a chroot com a\n"
+"                   opção --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "incapaz de acessar a primeira mídia de instalação."
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - modo de detalhe.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "mídia virtual precisa ser local"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "Erro ao registrar pacotes locais"
+msgid "unknown packages"
+msgstr "pacotes desconhecidos"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limita a velocidade do download.\n"
+msgid "unknown package"
+msgstr "pacote desconhecido."
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "encontrado 'hdlist' (ou síntese) em %s"
+msgid "removing package %s will break your system"
+msgstr "a remoção do pacote %s irá danificar seu sistema"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "Aquisição da fonte hdlist (ou síntese) falhou"
+msgid "Nothing to remove"
+msgstr "Nada para remover"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nenhum arquivo rpm encontrado em [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Verificando para remover os seguintes pacotes"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "Nada escrito na lista para \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes serão removidos (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Os seguintes pacotes contém assinaturas erradas"
+msgid " (y/N) "
+msgstr " (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "computando o md5sum de uma fonte 'hdlist' existente (ou síntese)"
+msgid "removing %s"
+msgstr "removendo %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - lista completa dos pacotes a remover.\n"
+msgid "Removing failed"
+msgstr "A remoção falhou"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versão %s\n"
+"Copyright (C) 2003 MandrakeSoft.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "incapaz de instalar o pacote %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - use somente mídia update (de atualização).\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
-"  --allow-force  - permite ao usuário instalar pacotes sem conferir\n"
-"                   dependências e integridade.\n"
+"  --media        - use somente as mídias listadas (separadas por vírgulas).\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "Save file"
-msgstr "Salvar arquivo"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - não usa a mídia fornecida (separadas por vírgulas).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - ordena as mídias (separadas por vírgulas).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "incapaz de gravar o arquivo de configuração [%s]"
+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"
 
-#: ../urpme:1
+#: ../urpmf:38
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modo de detalhe.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
+"  --quiet        - não imprime nenhuma tag (padrão caso nenhuma tag foi\n"
+"                   dada na linha de comando. Incompatível com modo\n"
+"                   interativo).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Chave Inválida ID (%s)"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - não lista linhas idênticas.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:42
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - força mesmo se alguns pacotes não existem.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - imprime todas as tags\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "incapaz de adquirir caminhos para mídia removível \"%s\""
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - imprime a tag 'group': group. \n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:44
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - tente encontrar e use o arquivo síntese.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - imprime a tag 'size': tamanho.\n"
 
-#: ../urpmi:1
+#: ../urpmf:45
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - usa a síntese dada ao invés do banco de dados urpmi.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - imprime a tag da 'epoch': época.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:46
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - força atualização da chave gpg.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - imprime a tag 'summary': sumário do pacote.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<caminho relativo do hdlist> faltando\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - imprime a tag 'description': descrição.\n"
 
-#: ../urpme:1
+#: ../urpmf:48
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Verificando para remover os seguintes pacotes"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - lista a tag 'sourcerpm': fonte do rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "unrequested"
-msgstr "não requisitado"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - lista a tag 'packager': empacotador. \n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "incapaz de acessar o arquivo rpm [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - lista a tag 'buildhost': máquina onde foi construído.\n"
 
-#: ../urpmf:1
+#: ../urpmf:51
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - imprime a tag 'files': lista todos os arquivos.\n"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - imprime a tag 'url': url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "incapaz de processar \"%s\" no arquivo [%s]"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - imprime a tag 'provides': lista todos os que provê.\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Você deseja continuar com a instalação?"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires     - imprime a tag 'requires': lista todos os que requer\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "incapaz de ler o arquivo rpm [%s] para a mídia \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - imprime a tag 'files': lista todos os arquivos.\n"
 
-#: ../urpmi:1
+#: ../urpmf:55
+#, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts    - imprime a tag 'conflicts': lista todos os conflitantes.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes    - imprime a tag 'obsoletes': lista todos os obsoletos.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - configura o urpmi por meio de uma árvore de distribuição\n"
-"                   padrão, útil para instalar um chroot com a\n"
-"                   opção --root.\n"
+"  --env          - usa um ambiente específico (tipicamente para relatório\n"
+"                   de falhas).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "Construindo arquivo de síntese de 'hdlist' para mídia \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - imprime informações úteis em formato que pode ser lido\n"
+"  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
-"  --version      - usa a versão especificada, o padrão é a versão do\n"
-"                   pacote 'mandrake-release' instalado.\n"
+"  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - usa um endereço url específico como lista de espelhos,\n"
-"                   o padrão é %s\n"
+"  -a             - operador binário 'E', verdadeiro se ambas expressões\n"
+"                   forem verdadeiras.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configura o urpmi por meio de uma árvore de distribuição\n"
-"                   padrão, útil para (des)instalar a chroot com a\n"
-"                   opção --root.\n"
+"  -o             - operador binário 'OU', verdadeiro se uma expressão for\n"
+"                   verdadeira.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operador unário 'NÃO', verdadeiro se a expressão é "
 "falsa.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - parênteses esquerdo para abrir grupo de expressão.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - parênteses direito para fechar um grupo de expressão.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Diretório [%s] já existe, favor usar outro diretório para reportar o "
-"problema ou apague-o"
+"a chamada de volta é:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "Desmontando %s"
+msgid "using specific environment on %s\n"
+msgstr "usando o ambiente específico em %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nada para atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "      %s%% completo, velocidade = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versão %s\n"
+"Copyright (C) 1999 - 2003 MandrakeSoft.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "reiniciando urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - usa a síntese dada ao invés do banco de dados urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "Examinando arquivo de síntese [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticamente seleciona os pacotes necessários para \n"
+"                   atualizar o sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tentar instalar com mais força (--force)? (s/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nunca pergunte para desistalar um pacote. Caso seja \n"
+"                   necessário, a instalação será abortada.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...falha na cópia"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - mantém os pacotes existentes se possível, recusando os\n"
+"                   pacotes solicitados que pedem a remoção do pacote.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "incapaz de acessar a arquivo 'hdlist' de \"%s\", mídia ignorada"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - divide em pequenas transações se mais de um pacote\n"
+"                   precisa ser instalado ou atualizado,\n"
+"                   o padrão é %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - modo silencioso (não informativo).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - transações em pequenos pedaços, o padrão é %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modo de detalhe.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - impõe uma busca aproximada (igual a -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - fornece todos os pacotes fonte antes de baixar\n"
-"                   (somente root).\n"
+"  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - extrai cabeçalhos de pacotes listados, da base de\n"
-"                   dados urpmi para saída padrão (somente root).\n"
+"  --install-src  - instala somente o pacote de fontes (sem binários).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pacotes desconhecidos"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove os rpm do cache antes de iniciar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "selecionando múltiplas mídias: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mantém o rpm não usado no cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
+"  --allow-nodeps - permite ao usuário instalar pacotes sem \n"
+"                   checagem de dependências.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "arquivo [%s] já está em uso na mesma mídia \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - permite ao usuário instalar pacotes sem conferir\n"
+"                   dependências e integridade.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nada para remover (use urpmi.addmedia para adicionar uma mídia)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configura o urpmi por meio de uma árvore de distribuição\n"
+"                   padrão, útil para instalar um chroot com a\n"
+"                   opção --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "incapaz de encontrar a lista para \"%s\", mídia ignorada."
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - usa wget para adquirir arquivos distantes.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - imprime esta mensagem de ajuda.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - usa curl para adquirir arquivos distantes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "Encontrada aquisição em paralelo com os nós: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limita a velocidade do download.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"a chamada de volta é:\n"
-"%s\n"
+"  --resume       - reinicia a transferência de arquivos parcialmente\n"
+"                   baixados (--no-resume desabilita isso, o padrão é\n"
+"                   desabilitado).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - busca reversa para o que requer o pacote.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - usa o proxy HTTP especificado, o número da porta\n"
+"                   é 1080 por padrão (o formato é <máquinaproxy[:porta]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versão %s\n"
-"Copyright (C) 2003 MandrakeSoft.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
+"  --proxy-user   - especifica usuário e senha para usar na autenticação\n"
+"                   do proxy (o formato é <usuário:senha>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - não imprime nenhuma tag (padrão caso nenhuma tag foi\n"
-"                   dada na linha de comando. Incompatível com modo\n"
-"                   interativo).\n"
+"  --bug          - escreve um relatório de falhas no diretório indicado\n"
+"                   pelo próximo argumento.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - não lista linhas idênticas.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - usa  a interface X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis não pode ser usada com --media, -excludemedia, -sortmedia, --"
-"update ou --parallel"
+"  --best-output  - escolhe a melhor interface de acordo com o ambiente:\n"
+"                   X ou modo texto.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - usa a arquitetura especificada, o padrão é a arquitetura\n"
-"                   especificada no pacote 'mandrake-release' instalado.\n"
+"  --verify-rpm   - verifica a assinatura do rpm antes da instalação.\n"
+"                   (--no-verify-rpm desabilita; por padrão é habilitado).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Tudo bem?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclui o(s) caminho(s), separados por vírgula.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclui arquivos de documentação.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - seleciona todos os listados na linha de comando.\n"
+
+#: ../urpmi:128
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --synthesis    - usa a síntese dada ao invés do banco de dados urpmi.\n"
+"  -p             - permite a busca em 'provides' para achar o pacote.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examinando aquisição em paralelo no arquivo [%s]"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - não procure em 'provides' para encontrar o pacote.\n"
 
-#: ../urpme:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nada para remover"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impõe uma busca aproximada (igual a --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "Lendo cabeçalhos da mídia \"%s\""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - modo silencioso (não informativo).\n"
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d             - estende a consulta para as dependências dos pacotes.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  nomes ou arquivos rpm dados na linha de comando serão instalados.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr "Escolha o local para salvar o arquivo"
+
+#: ../urpmi:197
+#, c-format
+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:1
+#: ../urpmi:204
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"  --bug          - escreve um relatório de falhas no diretório indicado\n"
-"                   pelo próximo argumento.\n"
+"Você selecionou um pacote de código:\n"
+"\n"
+"%s\n"
+"\n"
+"Provavelmente você não o tem instalado no seu computador (instalando-o\n"
+"poderá modificar seu código fonte e compilá-lo).\n"
+"\n"
+"O que você deseja fazer?"
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "a mídia \"%s\" não define uma localização para arquivos rpm"
+msgid "Do nothing"
+msgstr "Não faça nada"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - lista a tag 'sourcerpm': fonte do rpm.\n"
+msgid "Yes, really install it"
+msgstr "Sim, instalar realmente"
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "incapaz de gravar lista de arquivos de \"%s\""
+msgid "Save file"
+msgstr "Salvar arquivo"
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --requires     - imprime a tag 'requires': lista todos os que requer\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "tentando selecionar mídia inexistente \"%s\""
+"Você está para instalar o seguinte pacote de software em seu computador:\n"
+"\n"
+"%s\n"
+"\n"
+"Você pode salvá-lo apenas.  Que é sua escolha?"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - imprime a tag 'description': descrição.\n"
+msgid "Install it"
+msgstr "Instalar"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Falha na cópia"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Diretório [%s] já existe, favor usar outro diretório para reportar o "
+"problema ou apague-o"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - força a geração de arquivos 'hdlist'.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Incapaz de criar o diretório [%s] para relatório de falhas"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes só pode ser usado com --parallel"
+msgid "Copying failed"
+msgstr "Falha na cópia"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "Nenhum arquivo 'hdlist' encontrado para a mídia \"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Um dos pacotes a seguir é necessário:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "instalando %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Qual é a sua escolha? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lendo arquivos rpms de [%s]"
+msgid "Package installation..."
+msgstr "Instalação de pacotes..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "Copiando o arquivo de descrição de \"%s\"..."
+msgid "Initializing..."
+msgstr "Iniciando..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Alguns pacotes não puderam ser instalados:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "A remoção falhou"
+msgid "do you agree ?"
+msgstr "Você aceita?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - cria uma mídia virtual que será sempre atualizada,\n"
-"                   apenas o protocolo 'file://' é permitido.\n"
+"A instalação não pode continuar porque os seguitens pacotes\n"
+"precisam ser removidos para que os outros possam ser atualizados:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "o pacote %s não foi encontrado."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Estes pacotes precisam ser removidos para que os outros sejam atualizados:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "removendo a mídia \"%s\""
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão instalados (%"
+"d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "não precisa dar <caminho relativo do hdlist> com --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Você precisa ser root para instalar as seguintes dependências :\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Cancelar"
+msgid "unable to get source packages, aborting"
+msgstr "incapaz de obter pacotes fonte, abortando"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Insira a mídia chamada \"%s\" no dispositivo [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - usa um ambiente específico (tipicamente para relatório\n"
-"                   de falhas).\n"
+msgid "Press Enter when ready..."
+msgstr "Aperte enter quando estiver pronto..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - ordena as mídias (separadas por vírgulas).\n"
+msgid "Downloading package `%s'..."
+msgstr "Baixando o pacote `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "incapaz de acessar a mídia \"%s\""
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "incapaz de criar mídia \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "      %s%% completo, velocidade = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - lista a tag 'packager': empacotador. \n"
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes pacotes contém assinaturas erradas"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - descarregar (dump) a configuração na forma do argumento "
-"urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Você deseja continuar com a instalação?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Você precisa ser root para instalar as seguintes dependências :\n"
+"Instalação falhou, alguns arquivos estão faltando:.\n"
 "%s\n"
+"Você deve atualizar a sua base de dados urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - imprime 'changelog'.\n"
+msgid "Installation failed"
+msgstr "A Instalação falhou"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "incapaz de acessar a lista de arquivos de \"%s\", mídia ignorada."
+msgid "distributing %s"
+msgstr "distribuindo %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - parênteses direito para fechar um grupo de expressão.\n"
+msgid "installing %s"
+msgstr "instalando %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nenhuma webfetch encontrada, webfetch suportadas são: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "Examinando arquivo 'hdlist' [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tentar instalar sem checar as dependências? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "Copiando arquivo 'hdlist'..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tentar instalar com mais força (--force)? (s/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "Gravando a lista de arquivos para a mídia \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d instalação falhou"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "mídia virtual \"%s\" precisa ter uma url limpa, mídia ignorada."
+msgid "Installation is possible"
+msgstr "Instalação é possível"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "tudo já está instalado"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "reiniciando urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"  --buildhost    - lista a tag 'buildhost': máquina onde foi construído.\n"
+"uso: urpmi.addmedia [opções] <nome> <url> [with <caminho_relativo>]\n"
+"onde <url> é um entre:\n"
+"       file://<caminho_para_arquivo>\n"
+"       ftp://<login>:<senha>@<máquina>/<caminho> with "
+"<nome_relativo_de_hdlist>\n"
+"       ftp://<máquina>/<caminho> with <nome_relativo_de_hdlist>\n"
+"       http://<máquina>/<caminho> with <nome_relativo_de_hdlist>\n"
+"       removable://<caminho>\n"
+"\n"
+"e [opções] são\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "Não faça nada"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - cria uma mídia de atualização.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "usando a mídia associada para o modo paralelo: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - tente encontrar e use o arquivo síntese.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "Montando %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - tenta procurar e usar arquivo 'hdlist' \n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"Incapaz de lidar com a mídia \"%s\" porque o arquivo está sendo usado por "
-"outra mídia"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "incapaz de obter pacotes fonte, abortando"
+"  --no-probe     - não tentar procurar qualquer arquivo de síntese\n"
+"                   ou arquivo 'hdlist'.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - use outro root para instalação rpm.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automaticamente cria todas as mídias a partir de uma "
+"mídia\n"
+"                   de instalação.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "      %s%% de %s completo, ETA = %s, velocidade = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - cria automaticamente a mídia para a parte XXX \n"
+"                   de uma distribuição, XXX pode ser principal,\n"
+"                   atualizações ou qualquer outra que\n"
+"                   tenha sido configurada\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "computando o md5sum de uma fonte 'hdlist' recuperada (ou síntese)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - usa um endereço url específico como lista de espelhos,\n"
+"                   o padrão é %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "incapaz de importar arquivo de chave pública de \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - usa a versão especificada, o padrão é a versão do\n"
+"                   pacote 'mandrake-release' instalado.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nunca pergunte para desistalar um pacote. Caso seja \n"
-"                   necessário, a instalação será abortada.\n"
+"  --arch         - usa a arquitetura especificada, o padrão é a arquitetura\n"
+"                   especificada no pacote 'mandrake-release' instalado.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq versão %s\n"
-"Copyright (C) 2000 - 2003 MandrakeSoft.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GPL, "
-"GNU.\n"
-"\n"
-"uso:\n"
+"  --virtual      - cria uma mídia virtual que será sempre atualizada,\n"
+"                   apenas o protocolo 'file://' é permitido.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "Adquirindo a fonte 'hdlist' (ou a síntese) de \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - desabilita checagem de arquivo com MD5SUM.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - imprime grupos, com nome também.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - limpa o diretório dos cabeçalhos de cache.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "Mídia \"%s\" não está selecionada"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - força a geração de arquivos 'hdlist'.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "não foi possível adicionar atualizações de uma distribuição 'cooker'\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "usando o ambiente específico em %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "pegando os espelhos em %s...."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "Incapaz de encontrar arquivo 'hdlist' para \"%s\", mídia ignorada."
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "não precisa dar <caminho relativo do hdlist> com --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - transações em pequenos pedaços, o padrão é %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "incapaz de atualizar mídia \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - parênteses esquerdo para abrir grupo de expressão.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<caminho relativo do hdlist> faltando\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "muitos pontos de montagem para a mídia removível \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' faltando para mídia da rede\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operador binário 'E', verdadeiro se ambas expressões\n"
-"                   forem verdadeiras.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "incapaz de criar mídia \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"incapaz de acessar a mídia \"%s\",\n"
-"verifique se não é necessário montar manualmente o diretório no qual ela foi "
-"criada."
+"uso: urpmi.removemedia [-a] <nome> ...\n"
+"onde <nome> é um nome de mídia para remover.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - imprime a tag 'group': group. \n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - seleciona todas as mídias.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - use somente as mídias listadas (separadas por vírgulas).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "incapaz de criar a transação"
+"\n"
+"Opcões desconhecidas '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "Adquirindo os arquivos rpm da mídia \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nada para remover (use urpmi.addmedia para adicionar uma mídia)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Você selecionou um pacote de código:\n"
-"\n"
-"%s\n"
-"\n"
-"Provavelmente você não o tem instalado no seu computador (instalando-o\n"
-"poderá modificar seu código fonte e compilá-lo).\n"
-"\n"
-"O que você deseja fazer?"
+"a entrada para remover está faltando\n"
+"(um de %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuindo %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uso: urpmi.update [opções] <nome> ...\n"
+"onde <nome> é um nome de mídia para atualizar.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "A Instalação falhou"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - atualize somente a mídia de atualizações.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "grava o arquivo de configuração [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - força atualização da chave gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - seleciona todas as mídias não removíveis.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - imprime a tag da 'epoch': época.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nada para atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifica a assinatura do rpm antes da instalação.\n"
-"                   (--no-verify-rpm desabilita; por padrão é habilitado).\n"
+"a entrada a ser atualizada está faltando\n"
+"(uma de %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versão %s\n"
+"Copyright (C) 2003 MandrakeSoft.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Insira a mídia chamada \"%s\" no dispositivo [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - lista os pacotes disponíveis.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria uma mídia de atualização.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - lista as mídias disponíveis\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista mídias disponíveis e suas url's.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impõe uma busca aproximada (igual a --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - descarregar (dump) a configuração na forma do argumento "
+"urpmi.addmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descrição inválida \"%s\" no arquivo 'hdlists'"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - lista os nós disponíveis quando  --parallel é usada.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "removendo %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lista os apelidos paralelos disponíveis\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - cria automaticamente a mídia para a parte XXX \n"
-"                   de uma distribuição, XXX pode ser principal,\n"
-"                   atualizações ou qualquer outra que\n"
-"                   tenha sido configurada\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - imprime a tag 'size': tamanho.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "para continuar %s"
+"  --headers      - extrai cabeçalhos de pacotes listados, da base de\n"
+"                   dados urpmi para saída padrão (somente root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a não satisfazer %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - fornece todos os pacotes fonte antes de baixar\n"
+"                   (somente root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Instalação automática de pacotes...\n"
-"Você pediu a instalação do pacote %s\n"
+"  --use-distrib  - configura o urpmi por meio de uma árvore de\n"
+"                   distribuição. Isso permite consultar essa\n"
+"                   distribuição.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "Base de dados urpmi travada."
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - imprime 'changelog'.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --resume       - reinicia a transferência de arquivos parcialmente\n"
-"                   baixados (--no-resume desabilita isso, o padrão é\n"
-"                   desabilitado).\n"
+"  -d             - estende a consulta para as dependências dos pacotes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "examinando arquivo de chave pública em \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - remove um pacote se uma versão mais atual\n"
+"                   já estiver instalada.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - desabilita checagem de arquivo com MD5SUM.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - lista completa dos pacotes a remover.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "Pegando dispositivos removíveis como \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - busca reversa para o que requer o pacote.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Você está para instalar o seguinte pacote de software em seu computador:\n"
-"\n"
-"%s\n"
-"\n"
-"Você pode salvá-lo apenas.  Que é sua escolha?"
+"  -i             - imprime informações úteis em formato que pode ser lido\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - impõe uma busca aproximada (igual a -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - imprime grupos, com nome também.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - remove um pacote se uma versão mais atual\n"
-"                   já estiver instalada.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - imprime versão e 'release' com nome também.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - tenta procurar e usar arquivo 'hdlist' \n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista os arquivos do pacote.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "devido estar faltando %s"
+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"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - use somente mídia update (de atualização).\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes só pode ser usado com --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"uso: urpmi.update [opções] <nome> ...\n"
-"onde <nome> é um nome de mídia para atualizar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "Tentando contornar mídia existente \"%s\", evitando"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - verifica se a instalação pode ser efetuada corretamente.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Um dos seguintes pacotes é necessário para instalação %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versão %s\n"
+#~ "Copyright (C) 2000 - 2003 MandrakeSoft.\n"
+#~ "Este é um software livre, e pode ser redistribuído sob os termos da GPL, "
+#~ "GNU.\n"
+#~ "\n"
+#~ "uso:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Software de aquisição desconhecido`%s' !!!\n"
diff --git a/po/ro.po b/po/ro.po
index 54d60ddd..eeed8e81 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-20 08:39+0100\n"
 "Last-Translator: Harald Ersch <harald@ersch.ro>\n"
 "Language-Team: Romanian\n"
@@ -40,887 +40,781 @@ msgstr "DdYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalez %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - crearea automată a tuturor mediilor de pe un mediu\n"
-"                   de instalare.\n"
+"Instalare automată a pachetelor...\n"
+"Aţi cerut instalarea pachetului %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "nu pot deschide rpmdb"
+msgid "Is this OK?"
+msgstr "Este OK?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - afişează acest mesaj de ajutor.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Unul din următoarele pachete e necesar pt. instalarea %s:"
+msgid "Cancel"
+msgstr "Renunţă"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "şterg pachetul %s"
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: comanda nu a fost găsită\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Nu pot utiliza modul paralel in modul use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "totul este deja instalat"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - afişează acest mesaj de ajutor.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - curăţă directorul cache antete.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - afişare etichetă grup: grup.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using process %d for executing transaction"
-msgstr "folosesc procesul %d pentru executarea tranzacţiei"
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l         - listează fişierele din pachet.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - afişează eticheta Oferă: tot ce oferă (linii multiple).\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocol necunoscut definit pentru %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ce alegeţi? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nu gasesc webfech, versiunile suportate sunt: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "am găsit %d antete în cache"
+msgid "unable to handle protocol: %s"
+msgstr "nu pot folosi protocolul: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "există pachete multiple cu acelaşi nume de fişier rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "sintaxă eronată în fişierul de configurare la linia %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - specificare utilizator şi parolă pt. autentificarea "
-"proxy\n"
-"                   (formatul este <utilizator:parolă>).\n"
+"mediul \"%s\" încearcă să folosească un hdlist deja folosit, mediul este "
+"ignorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "efectuez a doua parcurgere pentru a calcula dependenţele\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"mediul \"%s\" încearcă să folosească o listă deja folosită, mediul este "
+"ignorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "copiere fişier rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"nu pot să mă ocupde mediul \"%s\" pentru că fişierul listă este deja folosit "
+"de alt mediu"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - listează alias-urile paralele disponibile.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nu pot folosi numele \"%s\" pentru mediul fără nume pentru că este deja "
+"folosit"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...copierea eşuată: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"nu pot să iau în considerare mediul \"%s\" pentru că nu există nici un "
+"fişier listă [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nu pot inspecta fişierul listă pentru \"%s\", mediul a fost ignorat"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nu pot determina mediul pentru acest fişier hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operator binar SAU, adevărat dacă una dintre expresii "
-"este adevărată.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nu pot accesa fişierul hdlist pentru \"%s\", ignor mediul"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Instalare pachete..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nu pot accesa fişierul listă pentru \"%s\", ignor mediul"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nume de fişier rpm invalid [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "încerc să sar pentru mediul existent \"%s\", evitare"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "declarare proxy greşită în linia de comandă\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"mediul virtual \"%s\" nu ar trebui să folosească un hdlist deja definit, "
+"mediul este ignorat"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d tranzacţii de instalarea eşuate"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"mediul virtual \"%s\" ar trebui să aibă un URL clar, mediul este ignorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"nu pot accesa primul mediu de instalare (nu am găsit fişierul Mandrake/base/"
-"hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nu pot găsi fişierul hdlist pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Aţi ales greşit, încercaţi din nou\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nu pot să găsesc fişierul listă pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Alegeţi locul unde salvez fişierul"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "fişier listă incoerent pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - afişare etichetă Sumar: sumar.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nu pot inspecta fişierul listă pentru \"%s\", mediul a fost ignorat"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Următoarele pachete conţin %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "prea multe puncte de montare pentru mediul \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Instalează"
+msgid "taking removable device as \"%s\""
+msgstr "consider dispozitivul mobil ca \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - foloseşte interfaţa X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Unul din următoarele pachete e necesar:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nu pot obţine calea pentru mediul \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "nu pot scrie în fişierul de configurare [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - alege cea mai bună interfaţă în funcţie de mediul de "
-"lucru:\n"
-"                   X sau mod text.\n"
+msgid "write config file [%s]"
+msgstr "scriere fişier de configurare [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Descarc pachetul `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Nu pot utiliza modul paralel in modul use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Ce se poate face cu fişierele rpm binare când se foloseşte --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nu pot parcurge \"%s\" în fişierul [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - selectare automată pachete pentru actualizare sistem.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "examinez descriptorul paralel din fişierul [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "nici un pachet numit %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "am găsit descriptorul paralel pentru nodurile: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - selectează toate potrivirile în linia de comandă.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "utilizez mediile asociate pentru modul paralel: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Instalare nereuşită, unele fişiere lipsesc.\n"
-"%s\n"
-"Probabil ar trebui să actualizaţi baza de date urpmi."
+msgid "unable to use parallel option \"%s\""
+msgstr "nu pot folosi opţiunea parallel \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Utilizare: urpmi.removemedia [-a] <nume>...\n"
-"unde <nume> este numele mediului de şters.\n"
+"--synthesis nu poate fi folosit cu --media, --excludemedia, sortmedia, --"
+"update sau --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalarea nu poate continua pt. că următoarele pachete \n"
-"trebuie şterse pentru ca altele să fie actualizate:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "examinez fişierul synthesis [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' lipseşte pentru mediul tip reţea\n"
+msgid "examining hdlist file [%s]"
+msgstr "examinez fişierul hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l         - listează fişierele din pachet.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "mediul virtual \"%s\" nu este local, mediul este ignorat"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pachet necunoscut "
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "Problemă la citirea fişierului hdlist/synthesis al mediului \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalarea este posibilă"
+msgid "performing second pass to compute dependencies\n"
+msgstr "efectuez a doua parcurgere pentru a calcula dependenţele\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "salt peste pachetul %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Pentru a satisface dependenţele, următoarele pachete vor fi instalate (% d "
-"MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "ar fi instalat în loc de actualizare pt. pachetul %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"nu pot să iau în considerare mediul \"%s\" pentru că nu există nici un "
-"fişier listă [%s]"
+msgid "unable to open rpmdb"
+msgstr "nu pot deschide rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (D/n) "
+msgid "medium \"%s\" already exists"
+msgstr "mediul \"%s\" deja există"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nu pot adăuga actualizări de la o distribuţie Cooker\n"
+msgid "virtual medium need to be local"
+msgstr "mediul virtual trebuie să fie local"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - mod detaliat.\n"
+msgid "added medium %s"
+msgstr "am adăugat mediul %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Iniţializare..."
+msgid "unable to access first installation medium"
+msgstr "nu pot accesa primul mediu de instalare"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - listează pachetele disponibile.\n"
+msgid "copying hdlists file..."
+msgstr "copiez fişierul hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - afişează toate etichetele\n"
+msgid "...copying failed"
+msgstr "...copierea a eşuat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
+msgid "...copying done"
+msgstr "...copierea s-a terminat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"mediul virtual \"%s\" nu ar trebui să folosească un hdlist deja definit, "
-"mediul este ignorat"
+"nu pot accesa primul mediu de instalare (nu am găsit fişierul Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "Calculez ms5sum pt. fişierul sursă hdlist/synthesis copiat"
+msgid "retrieving hdlists file..."
+msgstr "obţin fişierul hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - exclude calea separată prin virgulă.\n"
+msgid "...retrieving done"
+msgstr "...copierea este terminată"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Apăsaţi Enter când e gata..."
+msgid "...retrieving failed: %s"
+msgstr "...copierea eşuată: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opţiuni necunoscute '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "descriere hdlist invalidă \"%s\" în fişierul hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - împarte în tranzacţii mai mici, dacă se vor instala\n"
-"                   sau actualiza mai multe pachete decât date,\n"
-"                   implicit este %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "Problemă la citirea fişierului hdlist/synthesis al mediului \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "selectez medii multiple: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - foloseşte wget pentru obţinerea fişierelor de la "
-"distanţă.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - permite căutarea în Provides pentru găsirea pachetelor.\n"
+msgid "removing medium \"%s\""
+msgstr "elimin mediul \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - listează nodurile disponibile când se foloseşte --"
-"parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "creez hdlist [%s]"
+"nu pot accesa mediul \"%s\",\n"
+"asta se poate întampla dacă aţi montat manual directorul când aţi creat "
+"mediul."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - păstrează pachetele existente dacă este posibil, refuză\n"
-"                   pachetele cerute dacă duc la eliminări lor.\n"
+"mediul virtual \"%s\" ar trebui să aibăun hdlist/synthesis valid, mediul "
+"este ignorat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "examinare fişier MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comanda nu a fost găsită\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "calculez md5sum pentru fişierul sursă hdlist (sau synthesis) existent"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "nu pot înregistra fişierul rpm"
+msgid "examining MD5SUM file"
+msgstr "examinare fişier MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permite interogarea utilizatorului pt. instalarea "
-"pachetelor fără\n"
-"                   verificarea dependenţelor\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nu pot folosi protocolul: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "obţin fişierul hdlist..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "Calculez ms5sum pt. fişierul sursă hdlist/synthesis copiat"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Da, instalează-l"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "copierea [%s] a eşuat (eroare md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "am adăugat mediul %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - păstreză rpm-urile nefolosite în cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "citesc fişierele rpm de la [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"Tranzacţie creeată pt. instalarea pe %s (ştergere=%d, instalare=%d, "
-"actualizare=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nu pot citi fişierele rpm din [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "Nepotrivire md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "nu a fost găsit nici un fişier rpm de la [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaxă eronată în fişierul de configurare la linia %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  numele sau fişierele rpm date în linia de comandă vor fi instalate.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "am găsit hdlist (sau synthesis) verificat ca %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - foloseşte HTTP proxy specificat, numărul portului este "
-"considerat a fi\n"
-"                   implicit 1080 (formatul este <gazdăproxy[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "calculez md5sum a fişierului sursă hdlist/synthesis descărcat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "pentru a instala %s"
+msgid "md5sum mismatch"
+msgstr "Nepotrivire md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "am relocat %s intrări în depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "copierea hdlist sursă (sau synthesis) a eşuat"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fişierul [%s] este deja folosit în acelaşi mediu \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ar fi instalat în loc de actualizare pt. pachetul %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nu pot percurge fişierul hdlist pentru \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "obţin oglindirile de la %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "nu pot scrie fişierul listă pentru \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          -  afişare etichetă url: url\n"
+msgid "writing list file for medium \"%s\""
+msgstr "scriu fişierul listă pentru mediul \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocol necunoscut definit pentru %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "nu s-a scris nimic în fişierul listă pentru \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - afişează versiunea şi ediţia cu nume.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "examinez fişierul cheie publică pentru \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - afişează eticheta Perimat: toate perimatele.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "mediul \"%s\" deja există"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "instalez %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "citest antetele de pe mediul \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"intrarea de actualizat lipseşte\n"
-"(una din %s)\n"
+msgid "building hdlist [%s]"
+msgstr "creez hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "încerc să promovez %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "am construit fişierul synthesis pentru mediul \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nu pot şterge pachetul %s"
+msgid "found %d headers in cache"
+msgstr "am găsit %d antete în cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "elimin %d antete vechi din cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"intrarea de şters lipseşte\n"
-"(una din %s)\n"
+msgid "mounting %s"
+msgstr "montez %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selectează toate mediile.\n"
+msgid "unmounting %s"
+msgstr "demontare %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Semnătură lipsă (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "am relocat %s intrări în depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nu pot citi fişierele rpm din [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "nici o intrare relocată în depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuit între maşinile cu alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "nume de fişier rpm invalid [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "copiere fişier rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "nu pot accesa fişierul rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (D/n) "
+msgid "unable to register rpm file"
+msgstr "nu pot înregistra fişierul rpm"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - afişare etichetă grup: grup.\n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "eroare la înregistrarea pachetelor locale"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"mediul \"%s\" încearcă să folosească o listă deja folosită, mediul este "
-"ignorat"
+msgid "no package named %s"
+msgstr "nici un pachet numit %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "intrare incorectă: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Următoarele pachete conţin %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "ştergerea pachetului %s va strica sistemul dvs"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "există pachete multiple cu acelaşi nume de fişier rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - listează mediile disponibile.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nu pot parcurge corect [%s] pentru valoarea \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Unele pachete cerute nu pot fi instalate:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalarea pachetului `%s' (%s/%s)..."
+"mediul \"%s\" foloseşe un fişier listă invalid (oglindirea probabil nu este "
+"actualizată, încerc să folosesc o metodă alternativă)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nici o intrare relocată în depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "mediul \"%s\" nu defineşte nici o locaţie pentru fişiere rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalează numai pachetele sursă (fără binare).\n"
+msgid "package %s is not found."
+msgstr "pachetul %s nu a fost găsit."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - foloseşte curl pentru obţinerea fişierelor de la "
-"distanţă.\n"
+msgid "urpmi database locked"
+msgstr "baza de date urpmi este blocată"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include codul perl direct ca perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "mediul \"%s\" nu este selectat"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Sunteţi de acord?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nu pot citi fişierul rpm [%s] de pe mediul \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "fişier listă incoerent pentru \"%s\", mediul a fost ignorat"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aşa"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...copierea este terminată"
+msgid "unable to access medium \"%s\""
+msgstr "nu pot accesa mediul \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "adăugare pachet %s (id=%d, eid=%d, acualiz=%d, fişier=%s)"
+msgid "malformed input: [%s]"
+msgstr "intrare incorectă: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "salt peste pachetul %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Semnătură incorectă (%s)"
+msgid "Preparing..."
+msgstr "Pregătire..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-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"
+msgid "using process %d for executing transaction"
+msgstr "folosesc procesul %d pentru executarea tranzacţiei"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi versiunea %s\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nu pot parcurge corect [%s] pentru valoarea \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nu folosi mediile date, separate prin virgulă.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nu pot determina mediul pentru acest fişier hdlist [%s]"
+"Tranzacţie creeată pt. instalarea pe %s (ştergere=%d, instalare=%d, "
+"actualizare=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nu pot percurge fişierul hdlist pentru \"%s\""
+msgid "unable to create transaction"
+msgstr "nNu pot crea tranzacţia"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"mediul \"%s\" încearcă să folosească un hdlist deja folosit, mediul este "
-"ignorat"
+msgid "removing package %s"
+msgstr "şterg pachetul %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "datorita conflictelor cu %s"
+msgid "unable to remove package %s"
+msgstr "nu pot şterge pachetul %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "elimin %d antete vechi din cache"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "adăugare pachet %s (id=%d, eid=%d, acualiz=%d, fişier=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nu pot actualiza mediul \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "nu pot instala pachetul %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
+msgid "due to missing %s"
+msgstr "datorită %s lipsă"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "mediul virtual \"%s\" nu este local, mediul este ignorat"
+msgid "due to unsatisfied %s"
+msgstr "datorită %s nesatisfăcute"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Pregătire..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l         - listează fişierele din pachet.\n"
+msgid "trying to promote %s"
+msgstr "încerc să promovez %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
+msgid "in order to keep %s"
+msgstr "pentru a păstra %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  -no-probe     - nu încerca găsirea şi folosirea fişierelor\n"
-"                   synthesis sau hdlist.\n"
+msgid "in order to install %s"
+msgstr "pentru a instala %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - nu căuta în Provides pentru găsirea pachetelor.\n"
+msgid "due to conflicts with %s"
+msgstr "datorita conflictelor cu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "copierea [%s] a eşuat (eroare md5sum)"
+msgid "unrequested"
+msgstr "necerute"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  -use-distrib  - configurează urpmi instantaneu dintr-un arbore de "
-"distribuţie.\n"
-"                   Aceasta permite interogarea unei distribuţii.\n"
+msgid "Invalid signature (%s)"
+msgstr "Semnătură incorectă (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "ID cheie incorect (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - şterge rpm-urile din cache înainte de orice altceva.\n"
+msgid "Missing signature (%s)"
+msgstr "Semnătură lipsă (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nu pot folosi numele \"%s\" pentru mediul fără nume pentru că este deja "
-"folosit"
+msgid "bad proxy declaration on command line\n"
+msgstr "declarare proxy greşită în linia de comandă\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
-"  --conflicts     - afişează eticheta Conflicte: toate conflictele (linii "
-"multiple).\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"mediul virtual \"%s\" ar trebui să aibăun hdlist/synthesis valid, mediul "
-"este ignorat"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Aţi ales greşit, încercaţi din nou\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -936,1106 +830,1258 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - afişează acest mesaj de ajutor.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selectare automată pachet în opţiuni.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"utilizare: urpmi.addmedia [opţiuni] <nume> <url> [with <cale_relativă>]\n"
-"unde <url> este una din\n"
-"      file://<path>\n"
-"      ftp://<login>:<parola>@<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
-"      ftp://<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
-"      http://<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
-"      removable://<cale>\n"
-"\n"
-"şi [opţiuni] sunt dintre\n"
+"  --test         - verifică dacă instalarea poate fi îndeplinită corect.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - forţează invocarea chiar dacă unele pachete nu există.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...copierea s-a terminat"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuit între maşinile cu alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nu pot folosi opţiunea parallel \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --root         - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"mediul \"%s\" foloseşe un fişier listă invalid (oglindirea probabil nu este "
-"actualizată, încerc să folosesc o metodă alternativă)"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access first installation medium"
-msgstr "nu pot accesa primul mediu de instalare"
+"  --use-distrib  - configurare instantanee pt. urpmi dintr-un arbore de "
+"distribuţie, utilă\n"
+"                   pt. (dez)instalarea unui  chroot cu opţiunea --root .\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "mediul virtual trebuie să fie local"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - mod detaliat.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "error registering local packages"
-msgstr "eroare la înregistrarea pachetelor locale"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selectează toate pachetele ce se potrivesc cu expresia.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitează viteza de descărcare.\n"
+msgid "unknown packages"
+msgstr "pachete necunoscute "
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "am găsit hdlist (sau synthesis) verificat ca %s"
+msgid "unknown package"
+msgstr "pachet necunoscut "
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "copierea hdlist sursă (sau synthesis) a eşuat"
+msgid "removing package %s will break your system"
+msgstr "ştergerea pachetului %s va strica sistemul dvs"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nu a fost găsit nici un fişier rpm de la [%s]"
+msgid "Nothing to remove"
+msgstr "Nimic de şters"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nu s-a scris nimic în fişierul listă pentru \"%s\""
+msgid "Checking to remove the following packages"
+msgstr "Verific pt. ştergerea următoarelor pachete"
 
-#: ../urpmi:1
+#: ../urpme:106
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Următoarele pachete au semnături greşite"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "calculez md5sum pentru fişierul sursă hdlist (sau synthesis) existent"
+msgid " (y/N) "
+msgstr " (D/n) "
 
-#: ../urpmq:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - ieşire completă cu pachetul ce va fi şters.\n"
+msgid "removing %s"
+msgstr "elimin %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "unable to install package %s"
-msgstr "nu pot instala pachetul %s"
+msgid "Removing failed"
+msgstr "Ştergere nereuşită"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - permite interogarea utilizatorului pt. instalarea\n"
-"                   pachetelor fără verificarea dependenţelor şi a "
-"integrităţii.\n"
+"urpmf versiunea %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Salvare fişier"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - foloseşte numai mediile date, separate prin virgulă.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nu pot scrie în fişierul de configurare [%s]"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - nu folosi mediile date, separate prin virgulă.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  -a             - selectează toate pachetele ce se potrivesc cu expresia.\n"
+"  --sortmedia    - sortează mediile conform subşirurilor separate prin "
+"virgulă.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID cheie incorect (%s)"
+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"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "   --verbose      - mod detaliat.\n"
+
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - forţează invocarea chiar dacă unele pachete nu există.\n"
+"  --quiet        - nu afişează eticheta Nume (implicit dacă nu s-a dat "
+"eticheta\n"
+"                   în linia de comandă, incompatibil cu modul interactiv).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nu pot obţine calea pentru mediul \"%s\""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - nu afişează liniile identice.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - încearcă găsirea şi folosirea fişierelor synthesis.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - afişează toate etichetele\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - afişare etichetă grup: grup.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - forţează actualizarea cheii gpg.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - afişare etichetă Mărime: mărime.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "lipseşte <calea relativă a hdlist>\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - afişare etichetă epoch: epoch.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Verific pt. ştergerea următoarelor pachete"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - afişare etichetă Sumar: sumar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "necerute"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - afişare etichetă Descriere: descriere.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nu pot accesa fişierul rpm [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - afişare etichetă sourcepm: sursa rpm.\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - afişează eticheta Fişiere: toate fişierele.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - afişare etichetă Împachetat de: packager.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nu pot parcurge \"%s\" în fişierul [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - afişează eticheta (buildhost): buildhost.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Doriţi să continuaţi instalarea?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          -  afişare etichetă url: url\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nu pot citi fişierul rpm [%s] de pe mediul \"%s\""
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - afişează eticheta Oferă: tot ce oferă (linii multiple).\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configurare instantanee pt. urpmi dintr-un arbore de "
-"distribuţie, utilă\n"
-"                   pt. instalarea unui  chroot cu opţiunea --root .\n"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - afişează eticheta Necesită: toate necesităţile.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "am construit fişierul synthesis pentru mediul \"%s\""
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - afişează eticheta Fişiere: toate fişierele.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
-"  -i             - afişează informaţii utile pentru utilizatorul uman.\n"
+"  --conflicts     - afişează eticheta Conflicte: toate conflictele (linii "
+"multiple).\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - afişează eticheta Perimat: toate perimatele.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - foloseşte versiunea de distribuţie specificată, "
-"versiunea\n"
-"                   implicită este preluată de la versiunea distribuţiei "
-"raportată\n"
-"                   de pachetul mandrake-release instalat.\n"
+"  --env          - foloseşte un mediu specificat (tipic un raport\n"
+"                   de erori).\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
+
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include codul perl direct ca perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - foloseşte URL-ul specificat pentru lista oglinzilor, "
-"implicit este \n"
-"                   %s\n"
+"  -a             - operator binar ŞI, adevărat dacă ambele expresii sunt "
+"adevărate.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configurare instantanee pt. urpmi dintr-un arbore de "
-"distribuţie, utilă\n"
-"                   pt. (dez)instalarea unui  chroot cu opţiunea --root .\n"
+"  -o             - operator binar SAU, adevărat dacă una dintre expresii "
+"este adevărată.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  -!             - Negare unară, adevărată dacă expredia este falsă.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - paranteză stânga pentru deschidere expresii de grup.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - paranteză dreapta pentru închidere expresii de grup.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Directorul [%s] există deja, folosiţi un alt director pt. raportarea "
-"erorilor sau ştergeţi-l"
+"răspunsul este:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "demontare %s"
+msgid "using specific environment on %s\n"
+msgstr "folosind mediul specific pe %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% terminat, viteza = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versiunea %s\n"
+"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "repornesc urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "examinez fişierul synthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - selectare automată pachete pentru actualizare sistem.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall -nu se dezinstalează pachete niciodată, renunţă la "
+"instalare.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...copierea a eşuat"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - păstrează pachetele existente dacă este posibil, refuză\n"
+"                   pachetele cerute dacă duc la eliminări lor.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nu pot accesa fişierul hdlist pentru \"%s\", ignor mediul"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - împarte în tranzacţii mai mici, dacă se vor instala\n"
+"                   sau actualiza mai multe pachete decât date,\n"
+"                   implicit este %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - mod silenţios.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - lungime tranzacţii mici, implicit este %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "   --verbose      - mod detaliat.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy             - impune căutarea fuzzy (identic cu -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - dă toate pachetele sursă înainte de descărcare (numai "
-"root).\n"
+"  --src          - pachetul următor este un pachet sursă ( identic cu -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - extrage antete pentru pachetul listat din urpmi db la\n"
-"                   stdout (numai root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalează numai pachetele sursă (fără binare).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "pachete necunoscute "
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - şterge rpm-urile din cache înainte de orice altceva.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "selectez medii multiple: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - păstreză rpm-urile nefolosite în cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - permite interogarea utilizatorului pt. instalarea "
+"pachetelor fără\n"
+"                   verificarea dependenţelor\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fişierul [%s] este deja folosit în acelaşi mediu \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - permite interogarea utilizatorului pt. instalarea\n"
+"                   pachetelor fără verificarea dependenţelor şi a "
+"integrităţii.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nimic de şters (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configurare instantanee pt. urpmi dintr-un arbore de "
+"distribuţie, utilă\n"
+"                   pt. instalarea unui  chroot cu opţiunea --root .\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nu pot să găsesc fişierul listă pentru \"%s\", mediul a fost ignorat"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - foloseşte wget pentru obţinerea fişierelor de la "
+"distanţă.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - afişează acest mesaj de ajutor.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - foloseşte curl pentru obţinerea fişierelor de la "
+"distanţă.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "am găsit descriptorul paralel pentru nodurile: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitează viteza de descărcare.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"răspunsul este:\n"
-"%s\n"
+"  --resume   - continuă transferul fişierelor descărcate parţial.\n"
+"                   (--no-resume  dezactivează opţiunea, implicit este "
+"dezactivată).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -R             - căutare inversă în lista de dependenţe a pachetului.\n"
+"  --proxy        - foloseşte HTTP proxy specificat, numărul portului este "
+"considerat a fi\n"
+"                   implicit 1080 (formatul este <gazdăproxy[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf versiunea %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
+"  --proxy-user   - specificare utilizator şi parolă pt. autentificarea "
+"proxy\n"
+"                   (formatul este <utilizator:parolă>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - nu afişează eticheta Nume (implicit dacă nu s-a dat "
-"eticheta\n"
-"                   în linia de comandă, incompatibil cu modul interactiv).\n"
+"  --bug          - produce un raport de erori în directorul indicat de \n"
+"                   argumentul următor.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - nu afişează liniile identice.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - foloseşte interfaţa X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis nu poate fi folosit cu --media, --excludemedia, sortmedia, --"
-"update sau --parallel"
+"  --best-output  - alege cea mai bună interfaţă în funcţie de mediul de "
+"lucru:\n"
+"                   X sau mod text.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - foloseşte arhitectura specificată, implicită este "
-"arhitectura\n"
-"                   ediţiei Mandrake instalată\n"
+"  --verify-rpm   - verifică semnătura rpm înainte de instalare.\n"
+"                   (--no-verify-rpm o dezactivează, implicit este "
+"activată).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Este OK?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - exclude calea separată prin virgulă.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exclude fişierele documentaţie.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-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"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - selectează toate potrivirile în linia de comandă.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "examinez descriptorul paralel din fişierul [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - permite căutarea în Provides pentru găsirea pachetelor.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nimic de şters"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - nu căuta în Provides pentru găsirea pachetelor.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - impune căutarea fuzzy (identic cu --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "citest antetele de pe mediul \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - pachetul următor este un pachet sursă (identic cu -src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - extinde interogarea la dependenţele pachetelor.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - mod silenţios.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - produce un raport de erori în directorul indicat de \n"
-"                   argumentul următor.\n"
+"  numele sau fişierele rpm date în linia de comandă vor fi instalate.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "mediul \"%s\" nu defineşte nici o locaţie pentru fişiere rpm"
+msgid "Choose location to save file"
+msgstr "Alegeţi locul unde salvez fişierul"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - afişare etichetă sourcepm: sursa rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Ce se poate face cu fişierele rpm binare când se foloseşte --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nu pot scrie fişierul listă pentru \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Aţi selectat pachetul sursă:\n"
+"\n"
+"%s\n"
+"\n"
+"Probabil nu aţi dorit instalarea lui pe calculatorul dvs (instalarea\n"
+"v-ar fi permis modificarea codului sursă, apoi compilarea sa).\n"
+"\n"
+"Ce doriţi să faceţi?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - afişează eticheta Necesită: toate necesităţile.\n"
+msgid "Do nothing"
+msgstr "Nu fă nimic"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
+msgid "Yes, really install it"
+msgstr "Da, instalează-l"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - afişare etichetă Descriere: descriere.\n"
+msgid "Save file"
+msgstr "Salvare fişier"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Copierea a eşuat"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Sunteţi pe cale să intalaţi următorul pachet cu programe pe clculatorul "
+"dvs:\n"
+"\n"
+"%s\n"
+"\n"
+"În schimb, îl puteţi salva doar. Ce alegeţi?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - forţează generarea fişierelor hdlist.\n"
+msgid "Install it"
+msgstr "Instalează"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes poate fi folosit numai cu --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Directorul [%s] există deja, folosiţi un alt director pt. raportarea "
+"erorilor sau ştergeţi-l"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - pachetul următor este un pachet sursă (identic cu -src).\n"
+msgid "Copying failed"
+msgstr "Copierea a eşuat"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "instalez %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Doar superutilizatorul poate instala pachete"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "citesc fişierele rpm de la [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Unul din următoarele pachete e necesar:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Ce alegeţi? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selectare automată pachet în opţiuni.\n"
+msgid "Package installation..."
+msgstr "Instalare pachete..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Ştergere nereuşită"
+msgid "Initializing..."
+msgstr "Iniţializare..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - creează mediu virtual ce sunt actualizate continuu,\n"
-"                   este permis numai protocolul file://.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "pachetul %s nu a fost găsit."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "elimin mediul \"%s\""
+"Unele pachete cerute nu pot fi instalate:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
+msgid "do you agree ?"
+msgstr "Sunteţi de acord?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Renunţă"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Instalarea nu poate continua pt. că următoarele pachete \n"
+"trebuie şterse pentru ca altele să fie actualizate:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - pachetul următor este un pachet sursă ( identic cu -s).\n"
+"Unrmătoarele pachete trebuie şterse pentru ca altele să fie actualizate:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - foloseşte un mediu specificat (tipic un raport\n"
-"                   de erori).\n"
+"Pentru a satisface dependenţele, următoarele pachete vor fi instalate (% d "
+"MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - sortează mediile conform subşirurilor separate prin "
-"virgulă.\n"
+"Trebuie să fiţi root pentru a instala următoarele pachete dependente:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nu pot accesa mediul \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "Nu pot prelua pachetele sursă, întrerup"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "Nu pot creea mediul \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - afişare etichetă Împachetat de: packager.\n"
+msgid "Press Enter when ready..."
+msgstr "Apăsaţi Enter când e gata..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - afişează configurarea in formatul argumentului urpmi."
-"addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "Descarc pachetul `%s'..."
 
-#: ../urpmi:1
+#: ../urpmi:597
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"Trebuie să fiţi root pentru a instala următoarele pachete dependente:\n"
-"%s\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog          - afişează jurnalul modificărilor\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% terminat, viteza = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nu pot accesa fişierul listă pentru \"%s\", ignor mediul"
+msgid "The following packages have bad signatures"
+msgstr "Următoarele pachete au semnături greşite"
 
-#: ../urpmf:1
+#: ../urpmi:620
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Doriţi să continuaţi instalarea?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"  )              - paranteză dreapta pentru închidere expresii de grup.\n"
+"Instalare nereuşită, unele fişiere lipsesc.\n"
+"%s\n"
+"Probabil ar trebui să actualizaţi baza de date urpmi."
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nu gasesc webfech, versiunile suportate sunt: %s\n"
+msgid "Installation failed"
+msgstr "Instalarea a eşuat"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "examinez fişierul hdlist [%s]"
+msgid "distributing %s"
+msgstr "distribui %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copiez fişierul hdlist..."
+msgid "installing %s"
+msgstr "instalez %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "scriu fişierul listă pentru mediul \"%s\""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalarea pachetului `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"mediul virtual \"%s\" ar trebui să aibă un URL clar, mediul este ignorat"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
 
-#: ../urpmf:1
+#: ../urpmi:731
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - afişează eticheta (buildhost): buildhost.\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "Do nothing"
-msgstr "Nu fă nimic"
+msgid "%d installation transactions failed"
+msgstr "%d tranzacţii de instalarea eşuate"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "utilizez mediile asociate pentru modul paralel: %s"
+msgid "Installation is possible"
+msgstr "Instalarea este posibilă"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "mounting %s"
-msgstr "montez %s"
+msgid "Everything already installed"
+msgstr "totul este deja instalat"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
+msgid "restarting urpmi"
+msgstr "repornesc urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"nu pot să mă ocupde mediul \"%s\" pentru că fişierul listă este deja folosit "
-"de alt mediu"
+"utilizare: urpmi.addmedia [opţiuni] <nume> <url> [with <cale_relativă>]\n"
+"unde <url> este una din\n"
+"      file://<path>\n"
+"      ftp://<login>:<parola>@<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
+"      ftp://<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
+"      http://<gazdă>/<cale> with <nume relativ pt. hdlist>\n"
+"      removable://<cale>\n"
+"\n"
+"şi [opţiuni] sunt dintre\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "Nu pot prelua pachetele sursă, întrerup"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - creează un mediu de actualizare.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"  --root         - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
+"  --probe-synthesis - încearcă găsirea şi folosirea fişierelor synthesis.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% din %s terminat, ETA = %s, viteza = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - încearcă găsirea şi folosirea fişierelor hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "calculez md5sum a fişierului sursă hdlist/synthesis descărcat"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  -no-probe     - nu încerca găsirea şi folosirea fişierelor\n"
+"                   synthesis sau hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - crearea automată a tuturor mediilor de pe un mediu\n"
+"                   de instalare.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --no-uninstall -nu se dezinstalează pachete niciodată, renunţă la "
-"instalare.\n"
+"  --distrib-XXX  - creează automat un mediu pentru partea  XXX  a unei\n"
+"                   distribuţii, XXX poate fi main, contrib, updates sau\n"
+"                   orice altceva a fost configurat ;-)\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"urpmq versiunea %s\n"
-"Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
-"\n"
-"Utilizare:\n"
+"  --from         - foloseşte URL-ul specificat pentru lista oglinzilor, "
+"implicit este \n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - foloseşte versiunea de distribuţie specificată, "
+"versiunea\n"
+"                   implicită este preluată de la versiunea distribuţiei "
+"raportată\n"
+"                   de pachetul mandrake-release instalat.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - arată grupurile şi cu nume.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - foloseşte arhitectura specificată, implicită este "
+"arhitectura\n"
+"                   ediţiei Mandrake instalată\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "mediul \"%s\" nu este selectat"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - creează mediu virtual ce sunt actualizate continuu,\n"
+"                   este permis numai protocolul file://.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Doar superutilizatorul poate instala pachete"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+"  --no-md5sum    - dezactivează verificarea fişierelor folosind MD5SUM.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "folosind mediul specific pe %s\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - curăţă directorul cache antete.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nu pot găsi fişierul hdlist pentru \"%s\", mediul a fost ignorat"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - forţează generarea fişierelor hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - lungime tranzacţii mici, implicit este %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nu pot adăuga actualizări de la o distribuţie Cooker\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - paranteză stânga pentru deschidere expresii de grup.\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "obţin oglindirile de la %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "prea multe puncte de montare pentru mediul \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nu e nevoie să daţi <calea relativă pt. hdlist> cu --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operator binar ŞI, adevărat dacă ambele expresii sunt "
-"adevărate.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nu pot actualiza mediul \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"nu pot accesa mediul \"%s\",\n"
-"asta se poate întampla dacă aţi montat manual directorul când aţi creat "
-"mediul."
+msgid "<relative path of hdlist> missing\n"
+msgstr "lipseşte <calea relativă a hdlist>\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - afişare etichetă grup: grup.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' lipseşte pentru mediul tip reţea\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - foloseşte numai mediile date, separate prin virgulă.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "Nu pot creea mediul \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
-msgstr "nNu pot crea tranzacţia"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"Utilizare: urpmi.removemedia [-a] <nume>...\n"
+"unde <nume> este numele mediului de şters.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "copiere fişiere rpm de pe mediul \"%s\"..."
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selectează toate mediile.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
-"Aţi selectat pachetul sursă:\n"
-"\n"
-"%s\n"
 "\n"
-"Probabil nu aţi dorit instalarea lui pe calculatorul dvs (instalarea\n"
-"v-ar fi permis modificarea codului sursă, apoi compilarea sa).\n"
-"\n"
-"Ce doriţi să faceţi?"
+"opţiuni necunoscute '%s'\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
-msgstr "distribui %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nimic de şters (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "Instalarea a eşuat"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"intrarea de şters lipseşte\n"
+"(una din %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "scriere fişier de configurare [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Utilizare: urpmi.update [opţiuni] <nume>...\n"
+"unde <nume> este numele mediului de actualizat.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:38
+#, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
+
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - forţează actualizarea cheii gpg.\n"
+
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selectează toate mediile nedemontabile.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - afişare etichetă epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifică semnătura rpm înainte de instalare.\n"
-"                   (--no-verify-rpm o dezactivează, implicit este "
-"activată).\n"
+"intrarea de actualizat lipseşte\n"
+"(una din %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versiunea %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Vă rog să introduceţi mediul numit \"%s\" în dispozitivul [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - listează pachetele disponibile.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - creează un mediu de actualizare.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - listează mediile disponibile.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   - listează mediile disponibile şi URL-ul lor.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impune căutarea fuzzy (identic cu --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - afişează configurarea in formatul argumentului urpmi."
+"addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - listează nodurile disponibile când se foloseşte --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "descriere hdlist invalidă \"%s\" în fişierul hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - listează alias-urile paralele disponibile.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "elimin %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extrage antete pentru pachetul listat din urpmi db la\n"
+"                   stdout (numai root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - creează automat un mediu pentru partea  XXX  a unei\n"
-"                   distribuţii, XXX poate fi main, contrib, updates sau\n"
-"                   orice altceva a fost configurat ;-)\n"
+"  --sources      - dă toate pachetele sursă înainte de descărcare (numai "
+"root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - afişare etichetă Mărime: mărime.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  -use-distrib  - configurează urpmi instantaneu dintr-un arbore de "
+"distribuţie.\n"
+"                   Aceasta permite interogarea unei distribuţii.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "pentru a păstra %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog          - afişează jurnalul modificărilor\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "datorită %s nesatisfăcute"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - extinde interogarea la dependenţele pachetelor.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Instalare automată a pachetelor...\n"
-"Aţi cerut instalarea pachetului %s\n"
+"  -u             - şterge pachetul dacă o versiune mai recentă este deja "
+"instalată.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "baza de date urpmi este blocată"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - ieşire completă cu pachetul ce va fi şters.\n"
 
-#: ../urpmi:1
+#: ../urpmq:82
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --resume   - continuă transferul fişierelor descărcate parţial.\n"
-"                   (--no-resume  dezactivează opţiunea, implicit este "
-"dezactivată).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "examinez fişierul cheie publică pentru \"%s\"..."
+"  -R             - căutare inversă în lista de dependenţe a pachetului.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"  --no-md5sum    - dezactivează verificarea fişierelor folosind MD5SUM.\n"
+"  -i             - afişează informaţii utile pentru utilizatorul uman.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "consider dispozitivul mobil ca \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - arată grupurile şi cu nume.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Sunteţi pe cale să intalaţi următorul pachet cu programe pe clculatorul "
-"dvs:\n"
-"\n"
-"%s\n"
-"\n"
-"În schimb, îl puteţi salva doar. Ce alegeţi?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - afişează versiunea şi ediţia cu nume.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy             - impune căutarea fuzzy (identic cu -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l         - listează fişierele din pachet.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - şterge pachetul dacă o versiune mai recentă este deja "
-"instalată.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - încearcă găsirea şi folosirea fişierelor hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes poate fi folosit numai cu --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "datorită %s lipsă"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"Utilizare: urpmi.update [opţiuni] <nume>...\n"
-"unde <nume> este numele mediului de actualizat.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "încerc să sar pentru mediul existent \"%s\", evitare"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Unul din următoarele pachete e necesar pt. instalarea %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifică dacă instalarea poate fi îndeplinită corect.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versiunea %s\n"
+#~ "Copyright © 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Acest program este soft liber şi poate fi redistribuit în termenii GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "Utilizare:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Webfetch necunoscut `%s' !!!\n"
diff --git a/po/ru.po b/po/ru.po
index d4d286cd..9ece6abd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-27 09:16+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -39,878 +39,784 @@ msgstr "YyДд"
 msgid "Nn"
 msgstr "NnНн"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "устанавливается %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --disrtib      - автоматически создать все источники из инсталляционного\n"
-"                   источника.\n"
+"Автоматическая установка пакетов...\n"
+"Вы запросили установку пакета %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "невозможно открыть rpmdb"
+msgid "Is this OK?"
+msgstr "Это правильно?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - вывести эту подсказку.\n"
+msgid "Ok"
+msgstr "OК"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Необходимо установить один из следующих пакетов %s:"
+msgid "Cancel"
+msgstr "Отмена"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "удаляется пакет %s"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: команда не найдена\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
-"Не могу использовать параллельный режим совместно с use-distrib режимом"
+"использование: %s [параметры]\n"
+"где [параметры] такие\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Все уже установлено"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help         - вывести эту подсказку.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - очистить каталог кэша заголовков.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]        - ограничить результаты данной группой.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "процесс %d используется для выполнения транзакции"
+msgid "                    defaults is %s.\n"
+msgstr "                    по умолчанию %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - выводить тэг provides: все поставляемые файлы.\n"
+msgid "unknown protocol defined for %s"
+msgstr "для %s определен неизвестный протокол"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ваш выбор? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "не найден webfetch, поддерживается webfetch: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "найдено %d заголовков в кэше"
+msgid "unable to handle protocol: %s"
+msgstr "невозможно обработать протокол: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "существует несколько пакетов с одинаковым именем rpm файла \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "синтаксическая ошибка в config файле в строке %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - указать пользователя и пароль для авторизации на proxy\n"
-"                   (формат <пользователь:пароль>).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "производится второй проход вычисления зависимостей\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "извлекается rpm файл [%s] ..."
+"источник \"%s\" пытается использовать уже задействованный hdlist, источник "
+"игнорируется"
 
-#: ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - вывести список доступных параллельных алиасов.\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"источник \"%s\" пытается использовать уже использующийся список, источник "
+"игнорируется"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:196
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...получить не удалось: %s"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"невозможно сберечь источник \"%s\" так как файл списка уже используется "
+"другим источником"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "не получается проверить файл списка для \"%s\", источник игнорируется"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"невозможно использовать название \"%s\" для неименованного носителя. Имя уже "
+"занято"
 
-#: ../urpmf:1
+#: ../urpm.pm:209
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"  -o             - бинарный оператор OR, возвращает true, если одно\n"
-"                   из выражений true.\n"
+"невозможно принять во внимание источник \"%s\" так как не существует файла "
+"списка [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:213
 #, c-format
-msgid "Package installation..."
-msgstr "Устанавливается пакет..."
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "невозможно определить источник данного файла hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "неверное имя rpm файла [%s]"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "нет доступа к файлу hdlist для \"%s\", источник игнорируется"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "неверно указан proxy в командной строке\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "нет доступа к файлу списка источника \"%s\", источник игнорируется"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d транзакций установки завершились неудачей"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "попытка обойти существующий источник \"%s\", отменяется"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"нет доступа к первому источнику инсталляции (не найден файл Mandrake/base/"
-"hdlists)"
+"виртуальный источник \"%s\"не должен иметь определенный файл hdlist или файл "
+"списка, источник игнорируется"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Извините, плохой выбор, попробуйте снова\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"виртуальный источник \"%s\" должен содержать пустой url, источник "
+"игнорируется"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Choose location to save file"
-msgstr "Укажите куда сохранять файл"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "не получается найти hdlist файл для \"%s\", источник игнорируется"
 
-#: ../urpmf:1
+#: ../urpm.pm:278
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - выводить тэг summary: общие сведения.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "не получается найти файл списка для \"%s\", источник игнорируется"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:301
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следующие пакеты содержат %s: %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "несвязанный файл списка для \"%s\", источник игнорируется"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Install it"
-msgstr "Установить его"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "не получается проверить файл списка для \"%s\", источник игнорируется"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - использовать Х-интерфейс.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "слишком много точек монтирования для съемного источника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Нужен один из следующих пакетов:"
+msgid "taking removable device as \"%s\""
+msgstr "принимается съемное устройство как \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Для удовлетворения зависимостей следующие пакеты будут удалены (%d Мб)"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "используется другое съемное устройство [%s] для \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - выбрать наилучший интерфейс согласно окружению:\n"
-"                   Х или текстовый режим.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "невозможно получить путь к съемному источнику \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Загружается пакет `%s'..."
+msgid "unable to write config file [%s]"
+msgstr "не получается записать config файл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Что делать с бинарными rpm файлами при использовании --install-src"
+msgid "write config file [%s]"
+msgstr "записать config файл [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --auto-select  - автоматически выбрать пакеты для обновления системы.\n"
+"Не могу использовать параллельный режим совместно с use-distrib режимом"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:412
 #, c-format
-msgid "no package named %s"
-msgstr "нет пакета с именем %s"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "невозможно разобрать \"%s\" в файле [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - выбрать все соответствия из командной строки.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "проверяется параллельный обработчик в файле [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Установка не удалась, некоторые файлы отсутствуют:\n"
-"%s\n"
-"Возможно вам необходимо обновить базу данных urpmi"
+msgid "found parallel handler for nodes: %s"
+msgstr "найден параллельный обработчик для узлов: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"использование: urpmi.removemedia [-a] <имя> ...\n"
-"где <имя> - имя удаляемого источника.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "используется связанный носитель для параллельного режима: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "невозможно использовать параллельную опцию \"%s\""
+
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Установка не может быть продолжена так как следующие пакеты должны быть \n"
-"удалены для обновления остальных:\n"
-"%s\n"
+"--synthesis не может быть использован с --media, --excludemedia, --"
+"sortmedia, --update или --parallel"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' отсутствует для сетевого источника\n"
+msgid "examining synthesis file [%s]"
+msgstr "проверяется файл synthesis [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - выводить список файлов пакета.\n"
+msgid "examining hdlist file [%s]"
+msgstr "проверяется файл hdlist [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "неизвестный пакет"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr ""
+"виртуальный источник \"%s\" не является локальным, источник игнорируется"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "Установка возможна."
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "проблема чтения файла hdlist или synthesis источника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следующие пакеты будут удалены для обновления остальных:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "производится второй проход вычисления зависимостей\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Для удовлетворения зависимостей будет установлено %d следующих пакетов (%d "
-"МБ)"
+msgid "skipping package %s"
+msgstr "пропускается пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"невозможно принять во внимание источник \"%s\" так как не существует файла "
-"списка [%s]"
+msgid "would install instead of upgrade package %s"
+msgstr "будет произведена установка вместо обновления пакета %s"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "unable to open rpmdb"
+msgstr "невозможно открыть rpmdb"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "невозможно добавить обновления дистрибутива cooker\n"
+msgid "medium \"%s\" already exists"
+msgstr "источник \"%s\" уже существует"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - подробный режим.\n"
+msgid "virtual medium need to be local"
+msgstr "виртуальный источник должен быть локальным"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "Инициализация..."
+msgid "added medium %s"
+msgstr "добавлен источник %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - вывести список доступных пакетов.\n"
+msgid "unable to access first installation medium"
+msgstr "нет доступа к первому источнику инсталляции"
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - выводить все тэги.\n"
+msgid "copying hdlists file..."
+msgstr "копируется файл hdlists..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "непонятный источник \"%s\" отмечен как съемный, но это не так"
+msgid "...copying failed"
+msgstr "...копирование не удалось"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...копирование выполнено"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"виртуальный источник \"%s\"не должен иметь определенный файл hdlist или файл "
-"списка, источник игнорируется"
+"нет доступа к первому источнику инсталляции (не найден файл Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "вычисляется md5sum скопированного исходного hdlist (или synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "извлекается файл hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - исключить пути, разделенные запятыми.\n"
+msgid "...retrieving done"
+msgstr "...получение выполнено"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Нажмите Enter когда будете готовы..."
+msgid "...retrieving failed: %s"
+msgstr "...получить не удалось: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"неизвестные опции '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "неверное описание hdlist \"%s\" в файле hdlists "
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - разбить на маленькие транзакции, если будут\n"
-"                   устанавливаться или обновляться дополнительные\n"
-"                   пакеты кроме указанных,\n"
-"                   по умолчанию %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "попытка выбрать несуществующий источник \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "проблема чтения файла hdlist или synthesis источника \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "выбирается составной источник: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget          - использовать wget для получения удаленных файлов.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - разрешить поиск в provides, чтобы найти пакеты.\n"
+msgid "removing medium \"%s\""
+msgstr "удаляется источник \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - вывести список доступных узлов при использовании--"
-"parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "построение hdlist [%s]"
+"нет доступа к источнику \"%s\",\n"
+"так бывает если вы вручную монтировали каталог когда создавали источник."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - сохранить по возможности существующие пакеты, отклонить\n"
-"                   запрошенные пакеты, которые ведут к удалению.\n"
+"виртуальный источник \"%s\" должен иметь правильный исходный hdlist или "
+"synthesis, источник игнорируется"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "проверяется файл MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "копируется файл описания для \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: команда не найдена\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "вычисляется md5sum существующего исходного hdlist (или synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "не удается зарегистрировать rpm файл"
+msgid "examining MD5SUM file"
+msgstr "проверяется файл MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - позволяет спрашивать пользователя устанавливать\n"
-"                   пакеты без проверки зависимостей.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "копируется исходный hdlist (или synthesis) \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "невозможно обработать протокол: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "извлекается файл hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "вычисляется md5sum скопированного исходного hdlist (или synthesis)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Да, действительно установить его"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "копия [%s] не получилась (не совпадает md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "добавлен источник %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "проблема чтения файла synthesis источника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - сохранить в кэше неиспользованный rpm.\n"
+msgid "reading rpm files from [%s]"
+msgstr "читаются rpm файлы из [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "невозможно прочитать rpm файлы из [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "несоответствие md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "не найдены rpm файлы в [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "синтаксическая ошибка в config файле в строке %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "получение исходного hdlist (или synthesis) из \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  имена или rpm файлы, указанные в командной строке, будут установлены.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "найден искомый hdlist (или synthesis): %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - использовать определенный HTTP-прокси, по умолчанию\n"
-"                   используется порт 1080 (формат <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "вычисляется md5sum полученного исходного hdlist (или synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "чтобы установить %s"
+msgid "md5sum mismatch"
+msgstr "несоответствие md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "перенесено %s записей в depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "извлечение исходного hdlist (или synthesis) не удалось"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - игнорировать различия регистров во всех шаблонах.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "не найден файл hdlist для источника \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Невозможно создать каталог [%s] для вывода отчета об ошибке"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "файл [%s] уже используется в похожем источнике \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "будет произведена установка вместо обновления пакета %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "невозможно разобрать файл hdlist источника \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "извлекаются зеркала из %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "не удается записать файл списка для \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - выводить тэг url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "записывается файл списка для источника \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "для %s определен неизвестный протокол"
+msgid "nothing written in list file for \"%s\""
+msgstr "в файл списка для \"%s\" ничего не записано"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - вывести версию и номер релиза вместе с названием.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "проверяется файл открытого ключа для \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - выводить тэг obsoletes: все устаревшие файлы.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "источник \"%s\" уже существует"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "невозможно импортировать файл открытого ключа \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "устанавливается %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "читаются заголовки из источника \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"запись для обновления отсутствует\n"
-"(одна из %s)\n"
+msgid "building hdlist [%s]"
+msgstr "построение hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "попытка активизировать %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "создан файл hdlist synthesis для источника \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "невозможно удалить пакет %s"
+msgid "found %d headers in cache"
+msgstr "найдено %d заголовков в кэше"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "проблема чтения файла synthesis источника \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "удаляются %d устаревших заголовков в кэше"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"удаляемая запись отсутствует\n"
-"(одна из %s)\n"
+msgid "mounting %s"
+msgstr "монтируется %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - выбрать все источники.\n"
+msgid "unmounting %s"
+msgstr "отмонтируется %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Отсутствует подпись (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "перенесено %s записей в depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "невозможно прочитать rpm файлы из [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "ни одной записи не перенесено в depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi, распределенный по алиасам машин.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "неверное имя rpm файла [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "извлекается rpm файл [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - обновить только источник обновления.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "нет доступа к rpm файлу [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
+msgid "unable to register rpm file"
+msgstr "не удается зарегистрировать rpm файл"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]        - ограничить результаты данной группой.\n"
+msgid "error registering local packages"
+msgstr "ошибка регистрации локальных пакетов"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"источник \"%s\" пытается использовать уже использующийся список, источник "
-"игнорируется"
+msgid "no package named %s"
+msgstr "нет пакета с именем %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "неверно сформированный ввод: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Следующие пакеты содержат %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "удаление пакета %s нарушит работу вашей системы"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "существует несколько пакетов с одинаковым именем rpm файла \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - вывести список доступных источников.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "невозможно правильно разобрать [%s] в \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Некоторые запрошенные пакеты не могут быть установлены:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Устанавливается пакет `%s' (%s/%s)..."
+"источник \"%s\" использует неверный файл списка:\n"
+"  возможно зеркало устарело, попытка использовать альтернативный метод"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ни одной записи не перенесено в depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "источник \"%s\" не определяет местонахождение файлов rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - устанавливать только пакеты с исходным кодом\n"
-"                   (бинарники пропустить).\n"
+msgid "package %s is not found."
+msgstr "пакет %s не найден."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - использовать curl для получения удаленных файлов.\n"
+msgid "urpmi database locked"
+msgstr "база данных urpmi заблокирована"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - включать код perl непосредственно как perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "источник \"%s\" не выбран"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "вы согласны?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "невозможно прочитать rpm файл [%s] из источника \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "несвязанный файл списка для \"%s\", источник игнорируется"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "непонятный источник \"%s\" отмечен как съемный, но это не так"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...получение выполнено"
+msgid "unable to access medium \"%s\""
+msgstr "нет доступа к источнику \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "добавляется пакет %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "неверно сформированный ввод: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "пропускается пакет %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "идет получение файлов rpm из источника \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Неверная подпись (%s)"
+msgid "Preparing..."
+msgstr "Подготовка..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  запрошены указанные в командной строке имена или rpm файлы.\n"
+msgid "using process %d for executing transaction"
+msgstr "процесс %d используется для выполнения транзакции"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi версия %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Это свободное программное обеспечение и может распространяться при "
-"соблюдении условий GNU GPL.\n"
-"\n"
-"использование:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "невозможно правильно разобрать [%s] в \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - не использовать указанные источники, разделенные "
-"запятой.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "невозможно определить источник данного файла hdlist [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "невозможно разобрать файл hdlist источника \"%s\""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"источник \"%s\" пытается использовать уже задействованный hdlist, источник "
-"игнорируется"
+msgid "unable to create transaction"
+msgstr "невозможно создать транзакцию"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "из-за конфликтов с %s"
+msgid "removing package %s"
+msgstr "удаляется пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "удаляются %d устаревших заголовков в кэше"
+msgid "unable to remove package %s"
+msgstr "невозможно удалить пакет %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "невозможно обновить источник \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "добавляется пакет %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Попробовать установку без проверки зависимостей? (y/N) "
+msgid "unable to install package %s"
+msgstr "невозможно установить пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr ""
-"виртуальный источник \"%s\" не является локальным, источник игнорируется"
+msgid "due to missing %s"
+msgstr "из-за отсутствия %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Подготовка..."
+msgid "due to unsatisfied %s"
+msgstr "из-за неудовлетворенности %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    по умолчанию %s.\n"
+msgid "trying to promote %s"
+msgstr "попытка активизировать %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "используется другое съемное устройство [%s] для \"%s\""
+msgid "in order to keep %s"
+msgstr "чтобы сохранить %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - не пытаться найти файл synthesis или hdlist.\n"
+msgid "in order to install %s"
+msgstr "чтобы установить %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - не использовать provides при поиске пакета.\n"
+msgid "due to conflicts with %s"
+msgstr "из-за конфликтов с %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "копия [%s] не получилась (не совпадает md5sum)"
+msgid "unrequested"
+msgstr "незапрошенный"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - настраивать urpmi на лету из дерева distrib.\n"
-"                   Опция разрешает опрос дистрибутива.\n"
+msgid "Invalid signature (%s)"
+msgstr "Неверная подпись (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"использование: %s [параметры]\n"
-"где [параметры] такие\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Неверный Key ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - перед началом операции удалить rpm из кэша.\n"
+msgid "Missing signature (%s)"
+msgstr "Отсутствует подпись (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"невозможно использовать название \"%s\" для неименованного носителя. Имя уже "
-"занято"
+msgid "bad proxy declaration on command line\n"
+msgstr "неверно указан proxy в командной строке\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - выводить тэг conflicts: все конфликты.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: не могу прочитать rpm файл \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"виртуальный источник \"%s\" должен иметь правильный исходный hdlist или "
-"synthesis, источник игнорируется"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Извините, плохой выбор, попробуйте снова\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -927,1100 +833,1240 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - вывести эту подсказку.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматически выбрать пакет из предложенных.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"использование: urpmi.addmedia [опции] <имя> <url> [with "
-"<относительный_путь>]\n"
-"где <url> является одним из\n"
-"    file://<путь>\n"
-"    ftp://<логин>:<пароль>@<хост>/<путь> with <относительное имя файла "
-"hdlist>\n"
-"    ftp://<хост>/<путь> with <относительное имя файла hdlist>\n"
-"    http://<хост>/<путь> with <относительное имя файла hdlist>\n"
-"    removable://<путь>\n"
-"\n"
-"и [опции] являются одними из\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - проверять на возможность корректной установки.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "копируется исходный hdlist (или synthesis) \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - принудительно выполнить, даже если некоторые пакеты не \n"
+"                   существуют.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...копирование выполнено"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi, распределенный по алиасам машин.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "невозможно использовать параллельную опцию \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - использовать другой корень для установки rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"источник \"%s\" использует неверный файл списка:\n"
-"  возможно зеркало устарело, попытка использовать альтернативный метод"
+"  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
+"                   для (де)установки в chroot вместе с параметром  --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "нет доступа к первому источнику инсталляции"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - подробный режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "виртуальный источник должен быть локальным"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - выбрать все пакеты, соответствующие выражению.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "ошибка регистрации локальных пакетов"
+msgid "unknown packages"
+msgstr "неизвестные пакеты"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - ограничить скорость скачивания.\n"
+msgid "unknown package"
+msgstr "неизвестный пакет"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "найден искомый hdlist (или synthesis): %s"
+msgid "removing package %s will break your system"
+msgstr "удаление пакета %s нарушит работу вашей системы"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "извлечение исходного hdlist (или synthesis) не удалось"
+msgid "Nothing to remove"
+msgstr "Нечего удалять"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "не найдены rpm файлы в [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Проверяется возможность удаления следующих пакетов"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "в файл списка для \"%s\" ничего не записано"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Для удовлетворения зависимостей следующие пакеты будут удалены (%d Мб)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следующие пакеты имеют неверные подписи"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "вычисляется md5sum существующего исходного hdlist (или synthesis)"
+msgid "removing %s"
+msgstr "удаляется %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - выводить все данные о пакете при удалении.\n"
+msgid "Removing failed"
+msgstr "Удаление завершилось неудачей"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf версия %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Это открытое программное обеспечение и оно может распространяться при "
+"соблюдении условий GNU GPL.\n"
+"\n"
+"использование:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "невозможно установить пакет %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - использовать только источник обновления.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - использовать только указанные источники, разделенные "
+"запятыми.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - не использовать указанные источники, разделенные "
+"запятой.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - разрешить спрашивать у пользователя об установке\n"
-"                   пакетов без проверки зависимостей и целостности.\n"
+"  --sortmedia    - сортировать источники по подстрокам, разделенным\n"
+"                   запятой.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Сохранить файл"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - использовать synthesis вместо urpmi db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: не могу прочитать rpm файл \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - подробный режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "не получается записать config файл [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - не выводить тэг name (по умолчанию включен, если тэг не\n"
+"                   задан в командной строке, несовместим с интерактивным \n"
+"                   режимом).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - выбрать все пакеты, соответствующие выражению.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - не выводить идентичные строки.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Неверный Key ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - выводить все тэги.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - принудительно выполнить, даже если некоторые пакеты не \n"
-"                   существуют.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - выводить тэг group: группа.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "невозможно получить путь к съемному источнику \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - выводить тэг size: размер.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - попытаться найти и использовать файл synthesis.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - выводить тег epoch: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - использовать указанный synthesis вместо urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - выводить тэг summary: общие сведения.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - принудительно обновлять gpg-ключ.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - выводить тэг description: описание.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<относительный путь к hdlist> отсутствует\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - выводить тэг sourcerpm: исходный rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Проверяется возможность удаления следующих пакетов"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - вывести тэг packager: создатель пакета.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "незапрошенный"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - вывести тэг buildhost: хост, на котором создан.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "нет доступа к rpm файлу [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - выводить тэг url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - выводить тэг files: все файлы.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - выводить тэг provides: все поставляемые файлы.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "невозможно разобрать \"%s\" в файле [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - выводить тэг requires: все зависимости.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Желаете продолжить установку?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - выводить тэг files: все файлы.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "невозможно прочитать rpm файл [%s] из источника \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - выводить тэг conflicts: все конфликты.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - выводить тэг obsoletes: все устаревшие файлы.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
-"                   для (де)установки в chroot вместе с параметром --root.\n"
+"  --env          - использовать специфическое окружение (обычно отчет\n"
+"                   об ошибке).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "создан файл hdlist synthesis для источника \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - игнорировать различия регистров во всех шаблонах.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - вывод полезной информации в удобной для чтения форме.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - выводить версию, релиз и архитектуру с названием.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - использовать указанную версию дистрибутива, по умолчанию\n"
-"                   используется версия дистрибутива, сообщенная\n"
-"                   установленным пакетом mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - включать код perl непосредственно как perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - использовать указанный url для списка зеркал, по\n"
-"                   умолчанию используется %s\n"
+"  -a             - двоичный оператор AND, возвращает true, если оба\n"
+"                   выражения истинны.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
-"                   для (де)установки в chroot вместе с параметром  --root.\n"
+"  -o             - бинарный оператор OR, возвращает true, если одно\n"
+"                   из выражений true.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - унарный NOT, возвращает true, если выражение false.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - левая скобка, открывающая группу выражений.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - правая скобка, закрывающая группу выражений.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Каталог [%s] уже существует, используйте другой каталог для сообщения о баге "
-"или удалите его"
+"обратный вызов :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "отмонтируется %s"
+msgid "using specific environment on %s\n"
+msgstr "используется специфическое окружение для %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"нечего обновлять (используйте urpmi.addmedia чтобы добавить источник)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        выполнено %s%%, скорость = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi версия %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Это свободное программное обеспечение и может распространяться при "
+"соблюдении условий GNU GPL.\n"
+"\n"
+"использование:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi перезапускается"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - использовать указанный synthesis вместо urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "проверяется файл synthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - автоматически выбрать пакеты для обновления системы.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Попытаться установить насильно (--force)? (y/N)."
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - никогда не предлагать удалять пакет, прервать установку.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...копирование не удалось"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - сохранить по возможности существующие пакеты, отклонить\n"
+"                   запрошенные пакеты, которые ведут к удалению.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "нет доступа к файлу hdlist для \"%s\", источник игнорируется"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - разбить на маленькие транзакции, если будут\n"
+"                   устанавливаться или обновляться дополнительные\n"
+"                   пакеты кроме указанных,\n"
+"                   по умолчанию %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - тихий режим (quiet).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - длина маленькой транзакции, по умолчанию %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - подробный режим.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr ""
+"  --fuzzy        - задать поиск на основе нечеткой логики (аналогично -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - вывести все исходные пакеты перед скачиванием\n"
-"                   (только для root).\n"
+"  --src          - следующий пакет является исходным пакетом (аналогично -"
+"s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - извлечь заголовки пакетов, перечисленных в urpmi db\n"
-"                   в stdout (только для root).\n"
+"  --install-src  - устанавливать только пакеты с исходным кодом\n"
+"                   (бинарники пропустить).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "неизвестные пакеты"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - перед началом операции удалить rpm из кэша.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "выбирается составной источник: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - сохранить в кэше неиспользованный rpm.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - выводить версию, релиз и архитектуру с названием.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - позволяет спрашивать пользователя устанавливать\n"
+"                   пакеты без проверки зависимостей.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "файл [%s] уже используется в похожем источнике \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - разрешить спрашивать у пользователя об установке\n"
+"                   пакетов без проверки зависимостей и целостности.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "нечего удалять (используйте urpmi.addmedia чтобы добавить источник)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - настраивать urpmi на лету из дерева distrib, полезно\n"
+"                   для (де)установки в chroot вместе с параметром --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "не получается найти файл списка для \"%s\", источник игнорируется"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget          - использовать wget для получения удаленных файлов.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help         - вывести эту подсказку.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - использовать curl для получения удаленных файлов.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "найден параллельный обработчик для узлов: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - ограничить скорость скачивания.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"обратный вызов :\n"
-"%s\n"
+"  --resume       - продолжить трансфер частично закачанных файлов\n"
+"                   (--no-resume отключает это, по умолчанию отключено).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - искать требуемые пакеты в обратном порядке.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - использовать определенный HTTP-прокси, по умолчанию\n"
+"                   используется порт 1080 (формат <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf версия %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Это открытое программное обеспечение и оно может распространяться при "
-"соблюдении условий GNU GPL.\n"
-"\n"
-"использование:\n"
+"  --proxy-user   - указать пользователя и пароль для авторизации на proxy\n"
+"                   (формат <пользователь:пароль>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - не выводить тэг name (по умолчанию включен, если тэг не\n"
-"                   задан в командной строке, несовместим с интерактивным \n"
-"                   режимом).\n"
+"  --bug          - выводить отчет об ошибках в каталог, определенный\n"
+"                   следующим аргументом.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - не выводить идентичные строки.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - использовать Х-интерфейс.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis не может быть использован с --media, --excludemedia, --"
-"sortmedia, --update или --parallel"
+"  --best-output  - выбрать наилучший интерфейс согласно окружению:\n"
+"                   Х или текстовый режим.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - использовать указанную архитектуру, по умолчанию\n"
-"                   используется архитектура установленного пакета\n"
-"                   mandrake-release.\n"
+"  --verify-rpm   - проверять подпись rpm перед установкой\n"
+"                   (--no-verify-rpm отключит ее, по умолчанию включена).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Это правильно?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - исключить пути, разделенные запятыми.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - исключить файлы документации (docs).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - использовать synthesis вместо urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - выбрать все соответствия из командной строки.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "проверяется параллельный обработчик в файле [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - разрешить поиск в provides, чтобы найти пакеты.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Нечего удалять"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - не использовать provides при поиске пакета.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - задать поиск на основе нечеткой логики(аналогично --"
+"fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "читаются заголовки из источника \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - следующий пакет это исходный пакет (аналогично --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - расширенный запрос к зависимостям пакета.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - тихий режим (quiet).\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - выводить отчет об ошибках в каталог, определенный\n"
-"                   следующим аргументом.\n"
+"  имена или rpm файлы, указанные в командной строке, будут установлены.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "источник \"%s\" не определяет местонахождение файлов rpm"
+msgid "Choose location to save file"
+msgstr "Укажите куда сохранять файл"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - выводить тэг sourcerpm: исходный rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Что делать с бинарными rpm файлами при использовании --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "не удается записать файл списка для \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Вы выбрали пакет с исходными кодами:\n"
+"\n"
+"%s\n"
+"\n"
+"Возможно вам нет необходимости устанавливать его на свою машину (если вы "
+"его\n"
+"все же установите, тогда вы сможете вносить изменения в исходный код и "
+"затем\n"
+"компилировать его).\n"
+"\n"
+"Что будем делать?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - выводить тэг requires: все зависимости.\n"
+msgid "Do nothing"
+msgstr "Ничего не делать"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "попытка выбрать несуществующий источник \"%s\""
+msgid "Yes, really install it"
+msgstr "Да, действительно установить его"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - выводить тэг description: описание.\n"
+msgid "Save file"
+msgstr "Сохранить файл"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Копирование не удалось"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Вы собираетесь установить следующий пакет на свою машину:\n"
+"\n"
+"%s\n"
+"\n"
+"Вы можете его просто сохранить. Каков ваш выбор?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - принудительно создать файлы hdlist.\n"
+msgid "Install it"
+msgstr "Установить его"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes может использоваться только с --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Каталог [%s] уже существует, используйте другой каталог для сообщения о баге "
+"или удалите его"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "не найден файл hdlist для источника \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Невозможно создать каталог [%s] для вывода отчета об ошибке"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - следующий пакет это исходный пакет (аналогично --src).\n"
+msgid "Copying failed"
+msgstr "Копирование не удалось"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "устанавливается %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Только суперпользователю разрешается устанавливать пакеты"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "читаются rpm файлы из [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Нужен один из следующих пакетов:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "копируется файл описания для \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Ваш выбор? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматически выбрать пакет из предложенных.\n"
+msgid "Package installation..."
+msgstr "Устанавливается пакет..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Удаление завершилось неудачей"
+msgid "Initializing..."
+msgstr "Инициализация..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - создать виртуальный источник, который всегда up-to-date,\n"
-"                   допускается только протокол file://.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "пакет %s не найден."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "удаляется источник \"%s\""
+"Некоторые запрошенные пакеты не могут быть установлены:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "не нужно указывать <относительный путь к hdlist> с --distrib"
+msgid "do you agree ?"
+msgstr "вы согласны?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Отмена"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Установка не может быть продолжена так как следующие пакеты должны быть \n"
+"удалены для обновления остальных:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - следующий пакет является исходным пакетом (аналогично -"
-"s).\n"
+"Следующие пакеты будут удалены для обновления остальных:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - использовать специфическое окружение (обычно отчет\n"
-"                   об ошибке).\n"
+"Для удовлетворения зависимостей будет установлено %d следующих пакетов (%d "
+"МБ)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - сортировать источники по подстрокам, разделенным\n"
-"                   запятой.\n"
+"Вам необходимо иметь права root'а для установки следующих зависимостей:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "нет доступа к источнику \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "невозможно получить исходные пакеты, аварийное завершение"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "невозможно создать источник \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Пожалуйста, вставьте источник под названием \"%s\" в устройство [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - вывести тэг packager: создатель пакета.\n"
+msgid "Press Enter when ready..."
+msgstr "Нажмите Enter когда будете готовы..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - сбросить config в виде аргумента для urpmi.addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "Загружается пакет `%s'..."
 
-#: ../urpmi:1
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        выполнено %s%% из %s, ETA = %s, скорость = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        выполнено %s%%, скорость = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следующие пакеты имеют неверные подписи"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Желаете продолжить установку?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Вам необходимо иметь права root'а для установки следующих зависимостей:\n"
+"Установка не удалась, некоторые файлы отсутствуют:\n"
 "%s\n"
+"Возможно вам необходимо обновить базу данных urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - выводить changelog.\n"
+msgid "Installation failed"
+msgstr "Установка завершилась неудачей"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "нет доступа к файлу списка источника \"%s\", источник игнорируется"
+msgid "distributing %s"
+msgstr "разбрасывается %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - правая скобка, закрывающая группу выражений.\n"
+msgid "installing %s"
+msgstr "устанавливается %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "не найден webfetch, поддерживается webfetch: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Устанавливается пакет `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "проверяется файл hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Попробовать установку без проверки зависимостей? (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "копируется файл hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Попытаться установить насильно (--force)? (y/N)."
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "записывается файл списка для источника \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d транзакций установки завершились неудачей"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"виртуальный источник \"%s\" должен содержать пустой url, источник "
-"игнорируется"
+msgid "Installation is possible"
+msgstr "Установка возможна."
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - вывести тэг buildhost: хост, на котором создан.\n"
+msgid "Everything already installed"
+msgstr "Все уже установлено"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Ничего не делать"
+msgid "restarting urpmi"
+msgstr "urpmi перезапускается"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "используется связанный носитель для параллельного режима: %s"
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"использование: urpmi.addmedia [опции] <имя> <url> [with "
+"<относительный_путь>]\n"
+"где <url> является одним из\n"
+"    file://<путь>\n"
+"    ftp://<логин>:<пароль>@<хост>/<путь> with <относительное имя файла "
+"hdlist>\n"
+"    ftp://<хост>/<путь> with <относительное имя файла hdlist>\n"
+"    http://<хост>/<путь> with <относительное имя файла hdlist>\n"
+"    removable://<путь>\n"
+"\n"
+"и [опции] являются одними из\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "монтируется %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - создать источник для обновления.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"невозможно сберечь источник \"%s\" так как файл списка уже используется "
-"другим источником"
+"  --probe-synthesis - попытаться найти и использовать файл synthesis.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "невозможно получить исходные пакеты, аварийное завершение"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - попытаться найти и использовать файл hdlist.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - использовать другой корень для установки rpm.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - не пытаться найти файл synthesis или hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        выполнено %s%% из %s, ETA = %s, скорость = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --disrtib      - автоматически создать все источники из инсталляционного\n"
+"                   источника.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "вычисляется md5sum полученного исходного hdlist (или synthesis)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - автоматически создать источник для части ХХХ\n"
+"                   дистрибутива, XXX может быть main, contrib, updates или\n"
+"                   что угодно, что уже было настроено ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "невозможно импортировать файл открытого ключа \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - использовать указанный url для списка зеркал, по\n"
+"                   умолчанию используется %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  --no-uninstall - никогда не предлагать удалять пакет, прервать установку.\n"
+"  --version      - использовать указанную версию дистрибутива, по умолчанию\n"
+"                   используется версия дистрибутива, сообщенная\n"
+"                   установленным пакетом mandrake-release.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq версия %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Это открытое программное обеспечение и оно может распространяться при "
-"соблюдении условий GNU GPL.\n"
-"\n"
-"использование:\n"
+"  --arch         - использовать указанную архитектуру, по умолчанию\n"
+"                   используется архитектура установленного пакета\n"
+"                   mandrake-release.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "получение исходного hdlist (или synthesis) из \"%s\"..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - создать виртуальный источник, который всегда up-to-date,\n"
+"                   допускается только протокол file://.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - вывести группы вместе с названиями.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - не проверять MD5SUM файла.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "источник \"%s\" не выбран"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - очистить каталог кэша заголовков.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Только суперпользователю разрешается устанавливать пакеты"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - принудительно создать файлы hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "используется специфическое окружение для %s\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "невозможно добавить обновления дистрибутива cooker\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "не получается найти hdlist файл для \"%s\", источник игнорируется"
+msgid "retrieving mirrors at %s ..."
+msgstr "извлекаются зеркала из %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - длина маленькой транзакции, по умолчанию %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "не нужно указывать <относительный путь к hdlist> с --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - левая скобка, открывающая группу выражений.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "невозможно обновить источник \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "слишком много точек монтирования для съемного источника \"%s\""
+msgid "<relative path of hdlist> missing\n"
+msgstr "<относительный путь к hdlist> отсутствует\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - двоичный оператор AND, возвращает true, если оба\n"
-"                   выражения истинны.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' отсутствует для сетевого источника\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "невозможно создать источник \"%s\"\n"
+
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"нет доступа к источнику \"%s\",\n"
-"так бывает если вы вручную монтировали каталог когда создавали источник."
+"использование: urpmi.removemedia [-a] <имя> ...\n"
+"где <имя> - имя удаляемого источника.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - выводить тэг group: группа.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - выбрать все источники.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - использовать только указанные источники, разделенные "
-"запятыми.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "невозможно создать транзакцию"
+"\n"
+"неизвестные опции '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "идет получение файлов rpm из источника \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "нечего удалять (используйте urpmi.addmedia чтобы добавить источник)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Вы выбрали пакет с исходными кодами:\n"
-"\n"
-"%s\n"
-"\n"
-"Возможно вам нет необходимости устанавливать его на свою машину (если вы "
-"его\n"
-"все же установите, тогда вы сможете вносить изменения в исходный код и "
-"затем\n"
-"компилировать его).\n"
-"\n"
-"Что будем делать?"
+"удаляемая запись отсутствует\n"
+"(одна из %s)\n"
 
-#: ../urpmi:1
+#
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "разбрасывается %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"использование: urpmi.update [опции] <имя> ...\n"
+"где <имя> - имя обновляемого источника.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Установка завершилась неудачей"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - обновить только источник обновления.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "записать config файл [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - принудительно обновлять gpg-ключ.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - выбрать все не-съемные источники данных.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - выводить тег epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"нечего обновлять (используйте urpmi.addmedia чтобы добавить источник)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - проверять подпись rpm перед установкой\n"
-"                   (--no-verify-rpm отключит ее, по умолчанию включена).\n"
+"запись для обновления отсутствует\n"
+"(одна из %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf версия %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Это открытое программное обеспечение и оно может распространяться при "
+"соблюдении условий GNU GPL.\n"
+"\n"
+"использование:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Пожалуйста, вставьте источник под названием \"%s\" в устройство [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - вывести список доступных пакетов.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - создать источник для обновления.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - вывести список доступных источников.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - вывести список доступных источников и их url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - задать поиск на основе нечеткой логики(аналогично --"
-"fuzzy).\n"
+"  --dump-config  - сбросить config в виде аргумента для urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OК"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - вывести список доступных узлов при использовании--"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "неверное описание hdlist \"%s\" в файле hdlists "
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - вывести список доступных параллельных алиасов.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "удаляется %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - извлечь заголовки пакетов, перечисленных в urpmi db\n"
+"                   в stdout (только для root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - автоматически создать источник для части ХХХ\n"
-"                   дистрибутива, XXX может быть main, contrib, updates или\n"
-"                   что угодно, что уже было настроено ;-)\n"
+"  --sources      - вывести все исходные пакеты перед скачиванием\n"
+"                   (только для root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - выводить тэг size: размер.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - настраивать urpmi на лету из дерева distrib.\n"
+"                   Опция разрешает опрос дистрибутива.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "чтобы сохранить %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - выводить changelog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "из-за неудовлетворенности %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - расширенный запрос к зависимостям пакета.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Автоматическая установка пакетов...\n"
-"Вы запросили установку пакета %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "база данных urpmi заблокирована"
+"  -u             - удалить пакет если уже установлена более новая версия.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - продолжить трансфер частично закачанных файлов\n"
-"                   (--no-resume отключает это, по умолчанию отключено).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - выводить все данные о пакете при удалении.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "проверяется файл открытого ключа для \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - искать требуемые пакеты в обратном порядке.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - не проверять MD5SUM файла.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - вывод полезной информации в удобной для чтения форме.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "принимается съемное устройство как \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - вывести группы вместе с названиями.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Вы собираетесь установить следующий пакет на свою машину:\n"
-"\n"
-"%s\n"
-"\n"
-"Вы можете его просто сохранить. Каков ваш выбор?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - вывести версию и номер релиза вместе с названием.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr ""
-"  --fuzzy        - задать поиск на основе нечеткой логики (аналогично -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - выводить список файлов пакета.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - удалить пакет если уже установлена более новая версия.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  запрошены указанные в командной строке имена или rpm файлы.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - попытаться найти и использовать файл hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes может использоваться только с --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "из-за отсутствия %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - использовать только источник обновления.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"использование: urpmi.update [опции] <имя> ...\n"
-"где <имя> - имя обновляемого источника.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "попытка обойти существующий источник \"%s\", отменяется"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Необходимо установить один из следующих пакетов %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - проверять на возможность корректной установки.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq версия %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Это открытое программное обеспечение и оно может распространяться при "
+#~ "соблюдении условий GNU GPL.\n"
+#~ "\n"
+#~ "использование:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Неизвестный webfetch `%s' !!!\n"
diff --git a/po/sk.po b/po/sk.po
index 5c52fcf1..2d77d5c4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-10 01:48+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -33,873 +33,779 @@ msgstr "YyáÁaA"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "inštalujem %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automaticky vytvoriť všetky zdroje z inštalačného\n"
-"                   zdroja.\n"
+"Automatická inštalácia balíkov...\n"
+"Je požadovaná inštalácia balíka %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "nemôžem otvoriť rpmdb"
+msgid "Is this OK?"
+msgstr "Je to v poriadku?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - vypísať túto pomoc.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Zruš"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "odstraňovanie balíka %s"
+msgid " (Y/n) "
+msgstr " (Á/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: príkaz nebol nájdený\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Nie je možné používať paralelný režim pri use-distrib móde"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Všetko je už nainštalované"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - vypísať túto pomoc.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - zmazať hlavičky v adresári dočasnej pamäte.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - vypísať značku skupina: skupina.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "používa sa proces %d pre vykonanie transakcie"
+msgid "unknown protocol defined for %s"
+msgstr "neznámy protokol definovaný pre %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:79
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
-"  --provides     - vypísať značku poskytované: všetko čo je poskytované.\n"
+"nebol nájdený žiaden balík poskytujúci webfetch, podporované sú tieto: %s\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:95
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Váš výber? (1-%d) "
+msgid "unable to handle protocol: %s"
+msgstr "neznámy protokol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "found %d headers in cache"
-msgstr "nájdených %d hlavičiek v dočasnej pamäti"
+msgid "syntax error in config file at line %s"
+msgstr "syntaktická chyba v konfiguračnom súbore na riadku %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "existuje viacero balíkov s rovnakým menom rpm súboru \"%s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "zdroj \"%s\" sa pokúša použiť už použitý hdlist, zdroj je ignorovaný"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:180
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
-"  --proxy-user   - špecifikovanie používateľa a hesla pri použití proxy\n"
-"                   autentifikácie (formát je <používateľ:heslo>).\n"
+"zdroj \"%s\" skúša použiť už používaný súbor so zoznamom, zdroj je ignorovaný"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "druhý prechod pre výpočet závislostí\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"nieje možné používať zdroj \"%s\" ak je súbor so zoznamom použitý s iným "
+"zdrojom"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "sťahovanie rpm súboru [%s] ..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nieje možné použiť meno \"%s\" pre nepomenovaný zdroj pretože je už použité"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - vypísať dostupné paralelné aliasy.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"nieje možné vybrať zdroj \"%s\" pre účet ak neexistuje súbor so zoznamom [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...získavanie zlyhalo: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nieje možné určiť zdroj pre tento hdlist súbor [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nieje možné prezrieť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr ""
+"nieje možné pristúpiť k súboru hdlist pre \"%s\", zdroj bude ignorovaný"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
-"  -o             - binárny OR operátor, pravdivý ak jeden z výrazov je "
-"pravdivý.\n"
+"nieje možné pristúpiť k súboru s zoznamom pre \"%s\", zdroj bude ignorovaný"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Inštalácia balíkov..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokus o vynechanie existujúceho zdroja \"%s\", zrušené"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "nesprávne meno rpm súboru [%s]"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtuálny zdroj \"%s\" by nemal mať špecifikovaný hdlist súbor, zdroj je "
+"ignorovaný"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"virtuálny zdroj \"%s\" by mal obsahovať prázdnu url, zdroj je ignorovaný"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d inštalačná transakcia zlyhala"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nieje možné nájsť hdlist súbor pre \"%s\", zdroj je  ignorovaný"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"nieje možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
-"Mandrake/base/hdlists)"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nieje možné nájsť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Prepáčte, zlá voľba, skúste znova\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekoherentný súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
-msgstr "Vyberte umiestnenie pre uloženie súboru"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nieje možné prezrieť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - vypísať značku sumár: sumár.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Nasledujúce balíky obsahujú %s: %s"
+msgid "taking removable device as \"%s\""
+msgstr "výber vymeniteľného zariadenia ako \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Install it"
-msgstr "Nainštalovať"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - použiť X rozhranie.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nieje možné zistiť cestu pre vymeniteľný zdroj \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Jeden z nasledujúcich balíkov je potrebný:"
+msgid "unable to write config file [%s]"
+msgstr "nieje možné zapísať konfiguračný súbor [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Kvôli zachovaniu závislostí, by mali byť odinštalované nasledujúce balíky (%"
-"d MB)"
+msgid "write config file [%s]"
+msgstr "zápis konfiguračného súboru [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - vyberie sa najlepšie rozhranie pre aktuálne prostredie:\n"
-"                   X alebo textový mód.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Nie je možné používať paralelný režim pri use-distrib móde"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Získavanie balíka `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nieje možné správne prečítať \"%s\" v súbore [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-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"
+msgid "examining parallel handler in file [%s]"
+msgstr "prehliadanie paralelného ovládača v súbore [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - automatický výber balíkov pre aktualizáciu systému.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "nájdený paralélny ovládač pre uzly: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "žiaden balík s menom %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "použitie asociovaného zdroja pre paralelný režim: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - vyber všetky zhody na príkazovom riadku.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "nieje možné použiť voľbu parallel \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Inštalácia nebola úspešná, niektoré súbory chýbajú:\n"
-"%s\n"
-"Možno budete chcieť aktualizovať Vašu urpmi databázu"
+"--synthesis nie je možné používať s --media, --excludemedia, --sortmedia, --"
+"update alebo --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"použitie: urpmi.update [-a] <meno> ...\n"
-"kde <meno> je zdroj pre odstránenie.\n"
+msgid "examining synthesis file [%s]"
+msgstr "preverovanie synthesis súboru [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Inštalácia nemôže pokračovať pretože nasledovné balíky musia byť\n"
-"odstránené aby mohli byť iné aktualizované:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "preverovanie hdlist súboru [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "chýbajúce `with' pre sieťový zdroj\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtuálny zdroj \"%s\" nie je lokálny, zdroj je ignorovaný"
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problém s čítaním hdlist alebo synthesis súboru pre zdroj \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "neznámy balík"
+msgid "performing second pass to compute dependencies\n"
+msgstr "druhý prechod pre výpočet závislostí\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Inštalácia je možná"
+msgid "skipping package %s"
+msgstr "vynechávanie balíka %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
-"d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"nieje možné vybrať zdroj \"%s\" pre účet ak neexistuje súbor so zoznamom [%s]"
+msgid "unable to open rpmdb"
+msgstr "nemôžem otvoriť rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (á/N) "
+msgid "medium \"%s\" already exists"
+msgstr "zdroj \"%s\" už existuje"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nieje možné pridať aktualizáciu cooker distribúcie\n"
+msgid "virtual medium need to be local"
+msgstr "virtuálny zdroj by mal byť lokálny"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - vypisovať podrobnosti.\n"
+msgid "added medium %s"
+msgstr "pridaný zdroj %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializácia..."
+msgid "unable to access first installation medium"
+msgstr "nieje možné pristúpiť k prvému inštalačnému zdroju"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - vypísať všetky dostupné balíky.\n"
+msgid "copying hdlists file..."
+msgstr "kopírovanie hdlists súboru..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - vypísať všetky značky.\n"
+msgid "...copying failed"
+msgstr "...kopírovanie zlyhalo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"nekoherentný zdroj \"%s\" označený ako vymeniteľné, ale nie je tomu tak"
+msgid "...copying done"
+msgstr "...kopírovanie ukončené"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtuálny zdroj \"%s\" by nemal mať špecifikovaný hdlist súbor, zdroj je "
-"ignorovaný"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "výpočet md5sum zo zdroja hdlist (alebo synthesis)"
+"nieje možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
+"Mandrake/base/hdlists)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
-"  --excludepath  - cesty ktoré nemajú byť použité; viaceré je možné oddeliť\n"
-"                   čiarkou.\n"
+msgid "retrieving hdlists file..."
+msgstr "sťahovanie hdlists súboru..."
 
-# ******************fix me***********
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Stlačte Enter..."
+msgid "...retrieving done"
+msgstr "...sťahovanie ukončené"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"neznáma voľba '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...získavanie zlyhalo: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - rozdeliť na menšie transakcie ak má byť nainštalovaných\n"
-"                   alebo aktualizovaných viacero balíkov,\n"
-"                   štandardná hodnota je %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nesprávny hdlist popis \"%s\" v hdlists súbore"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problém s čítaním hdlist alebo synthesis súboru pre zdroj \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "pokus o výber neexistujúceho zdroja \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - použiť wget pre získanie vzdialených súborov.\n"
+msgid "selecting multiple media: %s"
+msgstr "výber viacerých zdrojov: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - pre nájdenie balíka hľadať aj v poskytovaných.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - vypísať dostupné uzly pre --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "odstránenie zdroja \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "vytváranie hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"nieje možné pristúpiť k zdroju \"%s\",\n"
+"čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - ponechať existujúce balíky ak je to možné, vynechať "
-"požadované\n"
-"                   balíky ktoré môžu viesť k odstraňovaniu.\n"
+"virtuálny zdroj \"%s\" zrejme obsahuje validný zdroj hdlist alebo synthesis, "
+"zroj je ignorovaný"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "overovanie MD5SUM súboru"
+msgid "copying description file of \"%s\"..."
+msgstr "kopírovanie súboru popisov pre \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: príkaz nebol nájdený\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "výpočet md5sum z existujúceho zdroja hdlist (alebo synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "nieje možné zaregistrovať rpm súbor"
+msgid "examining MD5SUM file"
+msgstr "overovanie MD5SUM súboru"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - umožniť rozhodnúť sa používateľovi pri inštalácii balíka "
-"bez\n"
-"                   overovania závislosti.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopírovanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "neznámy protokol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "sťahovanie hdlists súboru..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "výpočet md5sum zo zdroja hdlist (alebo synthesis)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Áno, naozaj inštalovať"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "pridaný zdroj %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problém s čítaním synthesis súboru pre zdroj \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ponechať nepoužité rpm súbory v dočasnej pamäti.\n"
+msgid "reading rpm files from [%s]"
+msgstr "čítanie rpm súborov z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
-"aktualizácia=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nieje možné čítať rpm súbory z [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "rozdielny md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "žiadné rpm súbory nájdené z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaktická chyba v konfiguračnom súbore na riadku %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "preberanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  mená alebo rpm súbory uvedené na príkazovom riadku budú nainštalované.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - použiť špecifikovanú HTTP proxy, číslo portu je\n"
-"                   štandardne 1080 (formát zápisu <proxy[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "pre inštaláciu balíka %s"
+msgid "md5sum mismatch"
+msgstr "rozdielny md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "premiestnené %s položky v depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "získavanie zdrojového hdlist (alebo synthesis) súboru zlyhalo"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignorovať veľkosť písma vo vzrokách.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "súbor [%s] už je použitý pre ten istý zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nieje možné správne prečítať hdlist súbor pre \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "sťahovanie mirrorov z %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "nieje možné zapísať súbor s zoznamom pre \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - vypísať značku url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "neznámy protokol definovaný pre %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "nič nebolo zapísané do zoznamového súboru pre \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - vypísať verziu a release s menom.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - vypísať značku zastaralé: všetko čo je zastaralé.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "zdroj \"%s\" už existuje"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "inštalujem %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "načitávanie hlavičiek pre zdroj \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"chýba položka pre aktualizáciu\n"
-"(jeden z %s)\n"
+msgid "building hdlist [%s]"
+msgstr "vytváranie hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "pokus o povýšenie %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nemôžem odinštalovať balík %s"
+msgid "found %d headers in cache"
+msgstr "nájdených %d hlavičiek v dočasnej pamäti"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problém s čítaním synthesis súboru pre zdroj \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "odstránenie %d nepotrebných hlavičiek z dočasnej pamäte"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"chýba položka pre odstránenie\n"
-"(jedna z %s)\n"
+msgid "mounting %s"
+msgstr "pripájanie %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - vybrať všetky zdroje.\n"
+msgid "unmounting %s"
+msgstr "odpája sa %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Chýbajúci podpis (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "premiestnené %s položky v depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nieje možné čítať rpm súbory z [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "žiadné položky neboli premiestnené v depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuované urpmi na rôzne stroje.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "nesprávne meno rpm súboru [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "sťahovanie rpm súboru [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - použiť len aktualizačné zdroje.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "nemôžem pristúpiť k rpm súboru [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Á/n) "
+msgid "unable to register rpm file"
+msgstr "nieje možné zaregistrovať rpm súbor"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - vypísať značku skupina: skupina.\n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "chyba pri registrácii lokálnych balíkov"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"zdroj \"%s\" skúša použiť už používaný súbor so zoznamom, zdroj je ignorovaný"
+msgid "no package named %s"
+msgstr "žiaden balík s menom %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "zlé zadaný vstup: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Nasledujúce balíky obsahujú %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odstránenie balíka %s zrejme poškodí váš systém"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "existuje viacero balíkov s rovnakým menom rpm súboru \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - vypísať dostupné zdroje.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nieje možné správne prečítať [%s] s hodnotou \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Niektoré požadované balíky nie je možné nainštalovať:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Inštalácia balíka `%s' (%s/%s)..."
+"zdroj \"%s\" používa nekorektný súbor so zoznamom:\n"
+"  mirror zrejme nieje aktualizovaný, skúste alternatívnu metódu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "žiadné položky neboli premiestnené v depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "zdroj \"%s\" nedefinuje žiadne umiestnenie rpm súborov"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - nainštalovať len zdrojový balík (bez bináriek).\n"
+msgid "package %s is not found."
+msgstr "balík %s nebol nájdený."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - použiť curl pre získanie vzdialených súborov.\n"
+msgid "urpmi database locked"
+msgstr "urpmi databáza je uzamknutá"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "zdroj \"%s\" nebol zvolený"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "súhlasíte ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nieje možné prečítať rpm súbor [%s] zo zdroja \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekoherentný súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"nekoherentný zdroj \"%s\" označený ako vymeniteľné, ale nie je tomu tak"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...sťahovanie ukončené"
+msgid "unable to access medium \"%s\""
+msgstr "nieje možné pristúpiť k zdroju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "pridávanie balíka %s (id=%d, eid=%d, aktualizácia=%d, súbor=%s)"
+msgid "malformed input: [%s]"
+msgstr "zlé zadaný vstup: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "vynechávanie balíka %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Chybný podpis (%s)"
+msgid "Preparing..."
+msgstr "Príprava..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  mená alebo rpm súbory zadané na príkazovom riadku budú dotazované.\n"
+msgid "using process %d for executing transaction"
+msgstr "používa sa proces %d pre vykonanie transakcie"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verzia %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
-"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
-"\n"
-"použitie:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nieje možné správne prečítať [%s] s hodnotou \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
-"čiarkou.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nieje možné určiť zdroj pre tento hdlist súbor [%s]"
+"vytvorenie transakcie pre inštaláciu %s (odstrániť=%d, inštalovať=%d, "
+"aktualizácia=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nieje možné správne prečítať hdlist súbor pre \"%s\""
+msgid "unable to create transaction"
+msgstr "nie je možné vytvoriť transakciu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "zdroj \"%s\" sa pokúša použiť už použitý hdlist, zdroj je ignorovaný"
+msgid "removing package %s"
+msgstr "odstraňovanie balíka %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "kvôli konfliktom s %s"
+msgid "unable to remove package %s"
+msgstr "nemôžem odinštalovať balík %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "odstránenie %d nepotrebných hlavičiek z dočasnej pamäte"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "pridávanie balíka %s (id=%d, eid=%d, aktualizácia=%d, súbor=%s)"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nemôžem aktualizovať zdroj \"%s\"\n"
+msgid "unable to install package %s"
+msgstr "nemôžem nainštalovať balík %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
+msgid "due to missing %s"
+msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtuálny zdroj \"%s\" nie je lokálny, zdroj je ignorovaný"
+msgid "due to unsatisfied %s"
+msgstr "kvôli neuspokojenému %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Preparing..."
-msgstr "Príprava..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
+msgid "trying to promote %s"
+msgstr "pokus o povýšenie %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
+msgid "in order to keep %s"
+msgstr "pre zachovanie poradia %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - neskúšať hľadať synthesis alebo hdlist súbor.\n"
+msgid "in order to install %s"
+msgstr "pre inštaláciu balíka %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - pre nájdenie balíka nehľadať v poskytovaných.\n"
+msgid "due to conflicts with %s"
+msgstr "kvôli konfliktom s %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
+msgid "unrequested"
+msgstr "nepožadovaný"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja.\n"
-"                   To umožňuje zadávať dotazy na distribúciu.\n"
+msgid "Invalid signature (%s)"
+msgstr "Chybný podpis (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Chybný kľúč (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - odstrániť nepoužité rpm súbory z dočasnej pamäti.\n"
+msgid "Missing signature (%s)"
+msgstr "Chýbajúci podpis (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nieje možné použiť meno \"%s\" pre nepomenovaný zdroj pretože je už použité"
+msgid "bad proxy declaration on command line\n"
+msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - vypísať značku konflikty: všetky konflikty.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nieje možné prečítať súbor \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtuálny zdroj \"%s\" zrejme obsahuje validný zdroj hdlist alebo synthesis, "
-"zroj je ignorovaný"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Prepáčte, zlá voľba, skúste znova\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -916,1102 +822,1243 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - vypísať túto pomoc.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatický výber balíkov v možnostiach.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"použitie: urpmi.addmedia [voľby] <meno> <url> [with <relatívnou cestou>]\n"
-"kde <url> je z\n"
-"       file://<cesta>\n"
-"       ftp://<login>:<heslo>@<hostiteľ>/<cesta> with <relatívnym menom "
-"súboru hdlist>\n"
-"       ftp://<hostiteľ>/<cesta> with <relatívnym menom súboru hdlist>\n"
-"       http://<hostiteľ>/<cesta> with <relatívnym menom súboru hdlist>\n"
-"       removable://<cesta>\n"
-"\n"
-"a [voľby] sú\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - overiť či bude inštalácia vykonaná bez problémov.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopírovanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - vynútiť vykonanie aj ak niektoré balíky neexistujú.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopírovanie ukončené"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuované urpmi na rôzne stroje.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nieje možné použiť voľbu parallel \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"zdroj \"%s\" používa nekorektný súbor so zoznamom:\n"
-"  mirror zrejme nieje aktualizovaný, skúste alternatívnu metódu"
+"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja, "
+"vhodné\n"
+"                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "nieje možné pristúpiť k prvému inštalačnému zdroju"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - vypisovať podrobnosti.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuálny zdroj by mal byť lokálny"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vyber všetky balíky zodpovedajúce výrazu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "chyba pri registrácii lokálnych balíkov"
+msgid "unknown packages"
+msgstr "neznáme balíky"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - obmedziť rýchlosť získavania súborov.\n"
+msgid "unknown package"
+msgstr "neznámy balík"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
+msgid "removing package %s will break your system"
+msgstr "odstránenie balíka %s zrejme poškodí váš systém"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "získavanie zdrojového hdlist (alebo synthesis) súboru zlyhalo"
+msgid "Nothing to remove"
+msgstr "Nič na odstránenie"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "žiadné rpm súbory nájdené z [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Kontrola odstraňovania týchto balíkov"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nič nebolo zapísané do zoznamového súboru pre \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Kvôli zachovaniu závislostí, by mali byť odinštalované nasledujúce balíky (%"
+"d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Nasledujúce balíky obsahujú zle signatúry"
+msgid " (y/N) "
+msgstr " (á/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "výpočet md5sum z existujúceho zdroja hdlist (alebo synthesis)"
+msgid "removing %s"
+msgstr "odstraňovanie %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kompletný výstup s balíkmi na odstránenie.\n"
+msgid "Removing failed"
+msgstr "Odstránenie neskončilo úspechom"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verzia %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
+"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
+"\n"
+"použitie:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "nemôžem nainštalovať balík %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použiť iba aktualizačné zroje.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - použiť len zadané zdroje; viaceré je možné oddeliť "
+"čiarkou.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
+"čiarkou.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - umožniť rozhodnúť sa používateľovi pre inštaláciu balíka "
-"bez\n"
-"                   overovania závislosti a integrity.\n"
+"  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
+"                   čiarkou.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Uložiť súbor"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - použiť zadaný synthesis namiesto urpmi db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nieje možné prečítať súbor \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mód s viac výpismi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nieje možné zapísať konfiguračný súbor [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - nevypisovať meno značky (štandardne ak nie je zadaná "
+"značka\n"
+"                   v príkazovom riadku čo je nekompatibilné s interaktívnym "
+"módom.).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vyber všetky balíky zodpovedajúce výrazu.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - nevypisovať zhodné riadky.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Chybný kľúč (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - vypísať všetky značky.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - vynútiť vykonanie aj ak niektoré balíky neexistujú.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - vypísať značku skupina: skupina.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nieje možné zistiť cestu pre vymeniteľný zdroj \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - vypísať značku veľkosť: veľkosť.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - pokúsiť sa nájsť a použiť synthesis súbor.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - vypísať značku epocha: epocha.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - vypísať značku sumár: sumár.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - vynútiť aktualizáciu gpg kľúča.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - vypísať značku popis: popis.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "chýba <relatívna cesta k hdlist>\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - vypísať značku sourcerpm: zdrojové rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrola odstraňovania týchto balíkov"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - vypísať značku packager: packager.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "nepožadovaný"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - vypísať značku buildhost: build host.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nemôžem pristúpiť k rpm súboru [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - vypísať značku url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - vypísať značku súbory: všetky súbory.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - vypísať značku poskytované: všetko čo je poskytované.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nieje možné správne prečítať \"%s\" v súbore [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - vypísať značku vyžadované: všetko vyžadované.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Chcete pokračovať v inštalácii ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - vypísať značku súbory: všetky súbory.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nieje možné prečítať rpm súbor [%s] zo zdroja \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - vypísať značku konflikty: všetky konflikty.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - vypísať značku zastaralé: všetko čo je zastaralé.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja, "
-"vhodné\n"
-"                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
+"  --env          - použiť špecifické prostredie (typické pre oznámenie o "
+"chybe).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignorovať veľkosť písma vo vzrokách.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - vypísať užitočné informácie v čitateľnom formáte.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - vypísať verziu, release a architektúru k menu.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - použiť špecifikovanú distribučnú verziu, štandardne je\n"
-"                   získavaná verzia distribúcie z nainštalovaného balíka\n"
-"                   mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - použiť zadanú url pre zoznam mirrorov, štandardne je to\n"
-"                   %s\n"
+"  -a             - binárny AND operátor, pravdivý ak sú obidva výrazy "
+"pravdivé.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja, "
-"vhodné\n"
-"                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
+"  -o             - binárny OR operátor, pravdivý ak jeden z výrazov je "
+"pravdivý.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unárne NOT, pravda ak je výraz nepravdivý.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - ľavá zátvorka pre otvorenie skupiny výrazov.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Adresár [%s] už existuje, použite prosím iný adresár pre hlásenie o chybe, "
-"alebo ho vymažte"
+"spätné volanie je :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "odpája sa %s"
+msgid "using specific environment on %s\n"
+msgstr "použitie špecifického prostredia na %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nie je čo aktualizovať (použi urpmi.addmedia na pridanie zdroja)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% hotové, rýchlosť = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzia %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
+"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
+"\n"
+"použitie:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "znovuspustenie urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "preverovanie synthesis súboru [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatický výber balíkov pre aktualizáciu systému.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nikdy sa nepýtať na odinštalovanie balíka, ukončiť\n"
+"                   inštaláciu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopírovanie zlyhalo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - ponechať existujúce balíky ak je to možné, vynechať "
+"požadované\n"
+"                   balíky ktoré môžu viesť k odstraňovaniu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"nieje možné pristúpiť k súboru hdlist pre \"%s\", zdroj bude ignorovaný"
+"  --split-level  - rozdeliť na menšie transakcie ak má byť nainštalovaných\n"
+"                   alebo aktualizovaných viacero balíkov,\n"
+"                   štandardná hodnota je %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tichý mód.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - malá veľkosť transakcií, štandardne je %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mód s viac výpismi.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - fuzzy vyhľadávanie (to isté ako -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - získať všetky zdrojové balíky pred sťahovaním (iba "
-"root).\n"
+"  --src          - nasledujúci balík je zdrojový balík (to isté ako -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - extrahovať hlavičky pre balík zo zoznamu urpmi databázy "
-"na\n"
-"                   stdout (iba root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - nainštalovať len zdrojový balík (bez bináriek).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "neznáme balíky"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - odstrániť nepoužité rpm súbory z dočasnej pamäti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "výber viacerých zdrojov: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ponechať nepoužité rpm súbory v dočasnej pamäti.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - vypísať verziu, release a architektúru k menu.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - umožniť rozhodnúť sa používateľovi pri inštalácii balíka "
+"bez\n"
+"                   overovania závislosti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "súbor [%s] už je použitý pre ten istý zdroj \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - umožniť rozhodnúť sa používateľovi pre inštaláciu balíka "
+"bez\n"
+"                   overovania závislosti a integrity.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nie je čo odstrániť (použi urpmi.addmedia na pridanie zdroja)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja, "
+"vhodné\n"
+"                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nieje možné nájsť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - použiť wget pre získanie vzdialených súborov.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - vypísať túto pomoc.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - použiť curl pre získanie vzdialených súborov.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nájdený paralélny ovládač pre uzly: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - obmedziť rýchlosť získavania súborov.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"spätné volanie je :\n"
-"%s\n"
+"  --resume       - pokračovať v získavaní pre súbory ktoré neboli kompletné\n"
+"                   (--no-resume zakáže takéto chovanie, štandardne je "
+"zakázané).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverzné hľadanie čo balík potrebuje.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - použiť špecifikovanú HTTP proxy, číslo portu je\n"
+"                   štandardne 1080 (formát zápisu <proxy[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf verzia %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
-"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
-"\n"
-"použitie:\n"
+"  --proxy-user   - špecifikovanie používateľa a hesla pri použití proxy\n"
+"                   autentifikácie (formát je <používateľ:heslo>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - nevypisovať meno značky (štandardne ak nie je zadaná "
-"značka\n"
-"                   v príkazovom riadku čo je nekompatibilné s interaktívnym "
-"módom.).\n"
+"  --bug          - vytvoriť oznámenie o chybe do adresára uvedeného\n"
+"                   za argumentom.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - nevypisovať zhodné riadky.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - použiť X rozhranie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis nie je možné používať s --media, --excludemedia, --sortmedia, --"
-"update alebo --parallel"
+"  --best-output  - vyberie sa najlepšie rozhranie pre aktuálne prostredie:\n"
+"                   X alebo textový mód.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - použiť špecifikovanú architektúru, štandardne je to "
-"architektúra\n"
-"                   z nainštalovaného balíčka mandrake-release.\n"
+"  --verify-rpm   - overiť podpis rpm balíka pred inštaláciou. (--no-verify-"
+"rpm\n"
+"                   zakáže overovanie, štandardne sa podpis overuje).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Je to v poriadku?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr ""
+"  --excludepath  - cesty ktoré nemajú byť použité; viaceré je možné oddeliť\n"
+"                   čiarkou.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - bez súborou s dokumentáciou.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - použiť zadaný synthesis namiesto urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - vyber všetky zhody na príkazovom riadku.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "prehliadanie paralelného ovládača v súbore [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - pre nájdenie balíka hľadať aj v poskytovaných.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nič na odstránenie"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - pre nájdenie balíka nehľadať v poskytovaných.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - fuzzy vyhľadávanie (to isté ako --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "načitávanie hlavičiek pre zdroj \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - nasledujúci balík je zdrojový balík (to isté ako --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - rozšíriť dotaz o závislosti pre balík.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tichý mód.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
-"  --bug          - vytvoriť oznámenie o chybe do adresára uvedeného\n"
-"                   za argumentom.\n"
+"  mená alebo rpm súbory uvedené na príkazovom riadku budú nainštalované.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "zdroj \"%s\" nedefinuje žiadne umiestnenie rpm súborov"
+msgid "Choose location to save file"
+msgstr "Vyberte umiestnenie pre uloženie súboru"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - vypísať značku sourcerpm: zdrojové rpm.\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"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nieje možné zapísať súbor s zoznamom pre \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Vybrali ste si zdrojový balík:\n"
+"\n"
+"%s\n"
+"\n"
+"Je možné, že ho nechcete skutočne inštalovať na váš počítač (jeho "
+"inštalácia\n"
+"vám umožní vykonať modifikácie alebo zmenu nastavenie kompilácie zdrojových\n"
+"kódov a potom ho prekompilovať).\n"
+"\n"
+"Čo si želáte spraviť?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - vypísať značku vyžadované: všetko vyžadované.\n"
+msgid "Do nothing"
+msgstr "Nič nevykonať"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "pokus o výber neexistujúceho zdroja \"%s\""
+msgid "Yes, really install it"
+msgstr "Áno, naozaj inštalovať"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - vypísať značku popis: popis.\n"
+msgid "Save file"
+msgstr "Uložiť súbor"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopírovanie zlyhalo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Vybrali ste si inštaláciu nasledovného softvérového balíka na váš počítač:\n"
+"\n"
+"%s\n"
+"\n"
+"Mali by ste preferovať jeho uloženie. Aký je váš výber?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - vnúť generovanie hdlist súborov.\n"
+msgid "Install it"
+msgstr "Nainštalovať"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes nemôže byť použité len s --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Adresár [%s] už existuje, použite prosím iný adresár pre hlásenie o chybe, "
+"alebo ho vymažte"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nemôžem vytvoriť adresár [%s] pre ohlásenie chyby"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - nasledujúci balík je zdrojový balík (to isté ako --src).\n"
+msgid "Copying failed"
+msgstr "Kopírovanie zlyhalo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "inštalácia %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Inštalovať balíky má dovolené len superužívateľ"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "čítanie rpm súborov z [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopírovanie súboru popisov pre \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Váš výber? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatický výber balíkov v možnostiach.\n"
+msgid "Package installation..."
+msgstr "Inštalácia balíkov..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Odstránenie neskončilo úspechom"
+msgid "Initializing..."
+msgstr "Inicializácia..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - vytvorenie virtuálneho zdroja, ktorý je vždy aktuálny,\n"
-"                   povolený je iba file:// protokol.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "package %s is not found."
-msgstr "balík %s nebol nájdený."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "odstránenie zdroja \"%s\""
+"Niektoré požadované balíky nie je možné nainštalovať:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
+msgid "do you agree ?"
+msgstr "súhlasíte ?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Zruš"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Inštalácia nemôže pokračovať pretože nasledovné balíky musia byť\n"
+"odstránené aby mohli byť iné aktualizované:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - nasledujúci balík je zdrojový balík (to isté ako -s).\n"
+"Nasledovné balíky by mali byť odstránené aby bolo možné aktualizovať iné:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - použiť špecifické prostredie (typické pre oznámenie o "
-"chybe).\n"
+"Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
+"d MB)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
-"                   čiarkou.\n"
+"Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nieje možné pristúpiť k zdroju \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "nie je možné získať zdrojové balíky, prerušenie"
 
-#: ../urpmi.addmedia:1
+# **************fix me****************
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nieje možné vytvoriť zdroj \"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
 
-#: ../urpmf:1
+# ******************fix me***********
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - vypísať značku packager: packager.\n"
+msgid "Press Enter when ready..."
+msgstr "Stlačte Enter..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - exportovať konfiguráciu v tvare argumentu pre urpmi."
-"addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "Získavanie balíka `%s'..."
 
-#: ../urpmi:1
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% z %s hotové, zostáva = %s, rýchlosť = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% hotové, rýchlosť = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Nasledujúce balíky obsahujú zle signatúry"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Chcete pokračovať v inštalácii ?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Musíte byť root ak chcete nainštalovať tieto aktualizácie:\n"
+"Inštalácia nebola úspešná, niektoré súbory chýbajú:\n"
 "%s\n"
+"Možno budete chcieť aktualizovať Vašu urpmi databázu"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - zobraziť históriu zmien.\n"
+msgid "Installation failed"
+msgstr "Inštalácia zlyhala"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"nieje možné pristúpiť k súboru s zoznamom pre \"%s\", zdroj bude ignorovaný"
+msgid "distributing %s"
+msgstr "distribuovanie %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
+msgid "installing %s"
+msgstr "inštalácia %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
-"nebol nájdený žiaden balík poskytujúci webfetch, podporované sú tieto: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Inštalácia balíka `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "preverovanie hdlist súboru [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopírovanie hdlists súboru..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d inštalačná transakcia zlyhala"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"virtuálny zdroj \"%s\" by mal obsahovať prázdnu url, zdroj je ignorovaný"
+msgid "Installation is possible"
+msgstr "Inštalácia je možná"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - vypísať značku buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "Všetko je už nainštalované"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Nič nevykonať"
+msgid "restarting urpmi"
+msgstr "znovuspustenie urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"použitie: urpmi.addmedia [voľby] <meno> <url> [with <relatívnou cestou>]\n"
+"kde <url> je z\n"
+"       file://<cesta>\n"
+"       ftp://<login>:<heslo>@<hostiteľ>/<cesta> with <relatívnym menom "
+"súboru hdlist>\n"
+"       ftp://<hostiteľ>/<cesta> with <relatívnym menom súboru hdlist>\n"
+"       http://<hostiteľ>/<cesta> with <relatívnym menom súboru hdlist>\n"
+"       removable://<cesta>\n"
+"\n"
+"a [voľby] sú\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "použitie asociovaného zdroja pre paralelný režim: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - vytvoriť aktualizačný zdroj.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "pripájanie %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - pokúsiť sa nájsť a použiť synthesis súbor.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"nieje možné používať zdroj \"%s\" ak je súbor so zoznamom použitý s iným "
-"zdrojom"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - pokúsiť sa nájsť a použiť hdlist súbor.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "nie je možné získať zdrojové balíky, prerušenie"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - neskúšať hľadať synthesis alebo hdlist súbor.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
-"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
+"  --distrib      - automaticky vytvoriť všetky zdroje z inštalačného\n"
+"                   zdroja.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% z %s hotové, zostáva = %s, rýchlosť = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automaticky vytvoriť zdroj pre XXX časť\n"
+"                   distribúcie, XXX môže byť main, contrib, updates alebo\n"
+"                   čokoľvek iné čo už bolo vytvorené ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - použiť zadanú url pre zoznam mirrorov, štandardne je to\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - použiť špecifikovanú distribučnú verziu, štandardne je\n"
+"                   získavaná verzia distribúcie z nainštalovaného balíka\n"
+"                   mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nikdy sa nepýtať na odinštalovanie balíka, ukončiť\n"
-"                   inštaláciu.\n"
+"  --arch         - použiť špecifikovanú architektúru, štandardne je to "
+"architektúra\n"
+"                   z nainštalovaného balíčka mandrake-release.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq verzia %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
-"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
-"\n"
-"použitie:\n"
+"  --virtual      - vytvorenie virtuálneho zdroja, ktorý je vždy aktuálny,\n"
+"                   povolený je iba file:// protokol.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "preberanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - zakázať MD5SUM kontrolu.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - vypísať skupiny aj s menami.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - zmazať hlavičky v adresári dočasnej pamäte.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "zdroj \"%s\" nebol zvolený"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - vnúť generovanie hdlist súborov.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Inštalovať balíky má dovolené len superužívateľ"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nieje možné pridať aktualizáciu cooker distribúcie\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "použitie špecifického prostredia na %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "sťahovanie mirrorov z %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nieje možné nájsť hdlist súbor pre \"%s\", zdroj je  ignorovaný"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - malá veľkosť transakcií, štandardne je %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nemôžem aktualizovať zdroj \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - ľavá zátvorka pre otvorenie skupiny výrazov.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "chýba <relatívna cesta k hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "chýbajúce `with' pre sieťový zdroj\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binárny AND operátor, pravdivý ak sú obidva výrazy "
-"pravdivé.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nieje možné vytvoriť zdroj \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"nieje možné pristúpiť k zdroju \"%s\",\n"
-"čo sa môže stať ak bol adresár pripojený počas vytvárania zdroja."
+"použitie: urpmi.update [-a] <meno> ...\n"
+"kde <meno> je zdroj pre odstránenie.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - vypísať značku skupina: skupina.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - vybrať všetky zdroje.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - použiť len zadané zdroje; viaceré je možné oddeliť "
-"čiarkou.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "nie je možné vytvoriť transakciu"
+"\n"
+"neznáma voľba '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "sťahovanie rpm súborov zo zdroja \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nie je čo odstrániť (použi urpmi.addmedia na pridanie zdroja)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Vybrali ste si zdrojový balík:\n"
-"\n"
-"%s\n"
-"\n"
-"Je možné, že ho nechcete skutočne inštalovať na váš počítač (jeho "
-"inštalácia\n"
-"vám umožní vykonať modifikácie alebo zmenu nastavenie kompilácie zdrojových\n"
-"kódov a potom ho prekompilovať).\n"
-"\n"
-"Čo si želáte spraviť?"
+"chýba položka pre odstránenie\n"
+"(jedna z %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuovanie %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"použitie: urpmi.update [voľby] <meno> ...\n"
+"kde <meno> je zdroj pre aktualizáciu.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Inštalácia zlyhala"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - použiť len aktualizačné zdroje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "zápis konfiguračného súboru [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - vynútiť aktualizáciu gpg kľúča.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - vybrať všetky nevymeniteľné zdroje.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - vypísať značku epocha: epocha.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nie je čo aktualizovať (použi urpmi.addmedia na pridanie zdroja)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - overiť podpis rpm balíka pred inštaláciou. (--no-verify-"
-"rpm\n"
-"                   zakáže overovanie, štandardne sa podpis overuje).\n"
+"chýba položka pre aktualizáciu\n"
+"(jeden z %s)\n"
 
-# **************fix me****************
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf verzia %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU GPL.\n"
+"Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
+"\n"
+"použitie:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - vypísať všetky dostupné balíky.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoriť aktualizačný zdroj.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - vypísať dostupné zdroje.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - vypísať dostupné zdroje a ich url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy vyhľadávanie (to isté ako --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - exportovať konfiguráciu v tvare argumentu pre urpmi."
+"addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - vypísať dostupné uzly pre --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nesprávny hdlist popis \"%s\" v hdlists súbore"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - vypísať dostupné paralelné aliasy.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "odstraňovanie %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - extrahovať hlavičky pre balík zo zoznamu urpmi databázy "
+"na\n"
+"                   stdout (iba root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automaticky vytvoriť zdroj pre XXX časť\n"
-"                   distribúcie, XXX môže byť main, contrib, updates alebo\n"
-"                   čokoľvek iné čo už bolo vytvorené ;-)\n"
+"  --sources      - získať všetky zdrojové balíky pred sťahovaním (iba "
+"root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - vypísať značku veľkosť: veľkosť.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - nastaviť urpmi pre používanie distribučného zdroja.\n"
+"                   To umožňuje zadávať dotazy na distribúciu.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "pre zachovanie poradia %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - zobraziť históriu zmien.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "kvôli neuspokojenému %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - rozšíriť dotaz o závislosti pre balík.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatická inštalácia balíkov...\n"
-"Je požadovaná inštalácia balíka %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "urpmi databáza je uzamknutá"
+"  -u             - odstrániť balík ak už je nainštalovaná novšia verzia.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - pokračovať v získavaní pre súbory ktoré neboli kompletné\n"
-"                   (--no-resume zakáže takéto chovanie, štandardne je "
-"zakázané).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kompletný výstup s balíkmi na odstránenie.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverzné hľadanie čo balík potrebuje.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - zakázať MD5SUM kontrolu.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - vypísať užitočné informácie v čitateľnom formáte.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "výber vymeniteľného zariadenia ako \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - vypísať skupiny aj s menami.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Vybrali ste si inštaláciu nasledovného softvérového balíka na váš počítač:\n"
-"\n"
-"%s\n"
-"\n"
-"Mali by ste preferovať jeho uloženie. Aký je váš výber?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - vypísať verziu a release s menom.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - fuzzy vyhľadávanie (to isté ako -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - odstrániť balík ak už je nainštalovaná novšia verzia.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  mená alebo rpm súbory zadané na príkazovom riadku budú dotazované.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - pokúsiť sa nájsť a použiť hdlist súbor.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes nemôže byť použité len s --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "kvôli chýbajucemu %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použiť iba aktualizačné zroje.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"použitie: urpmi.update [voľby] <meno> ...\n"
-"kde <meno> je zdroj pre aktualizáciu.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokus o vynechanie existujúceho zdroja \"%s\", zrušené"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Jeden z nasledujúcich balíkov je potrebné nainštalovať %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - overiť či bude inštalácia vykonaná bez problémov.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq verzia %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Toto je slobodný softvér a musí byť redistribuovaný pod licenciou GNU "
+#~ "GPL.\n"
+#~ "Problémy s prekladom: Mandrake-i18n@lists.linux.sk.\n"
+#~ "\n"
+#~ "použitie:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Neznámy program na získavanie súborov `%s' !!!\n"
diff --git a/po/sl.po b/po/sl.po
index 8ea39063..004e3e14 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-29 14:10+0200\n"
 "Last-Translator: Tadej Panjtar <panjtar@email.si>\n"
 "Language-Team: slovenian <sl@li.org>\n"
@@ -40,866 +40,779 @@ msgstr "Dd"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "nameščam %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - avtomatsko kreiraj vse medije iz namestitvenega\n"
-"                   medija.\n"
+"Samodejno nameščanje paketov\n"
+"Vi ste zahtevali namestitev paketa %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "nemogoče odpreti rpmdb"
+msgid "Is this OK?"
+msgstr "Je to v redu?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - prikaže to sporočilo s pomočjo.\n"
+msgid "Ok"
+msgstr "V redu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Za namestitev je potreben en od sledečih paketov %s:"
+msgid "Cancel"
+msgstr "Prekliči"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "odstranjevanje paketa %s"
+msgid " (Y/n) "
+msgstr "(D/n)"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: ukaz ni najden\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Ne morem uporabiti vzporednega načina z začinom use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"uporaba: %s [možnosti]\n"
+"kjer so [možnosti] med\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Vse je že nameščeno"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - prikaže to sporočilo s pomočjo.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - počisti imenik z medpomnilnikom zglavij.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - omeji rezultate za podano skupino.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "uporabljam proces %d za izvajanje transakcije"
+msgid "                    defaults is %s.\n"
+msgstr "                    prevzeto je %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - izpiše oznako provides: vse provides.\n"
+msgid "unknown protocol defined for %s"
+msgstr "neznan definiran protokol za %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Kakšna je tvoja izbira? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "najdenih je %d zglavij v medpomnilniku"
+msgid "unable to handle protocol: %s"
+msgstr "nemogoče obravnavati protokol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "tu je več paketov z istim imenom rpm datoteke \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "sintaktična napaka v nastavitveni datoteki v vrstici %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - določi uporabnika in geslo za uporabo avtentifikacije\n"
-"                   pri posredniku (formatje <uporabnik:geslo>).\n"
+"medij \"%s\" poskuša uporabiti že uporabljen seznam hdlist, medij je zato "
+"prezrt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "izvajam drugi prehod za izračun odvisnosti\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"medij \"%s\" poskuša uporabiti že uporabljen seznam, medij je zato prezrt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "prinašam rpm datoteko [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"nemogoče je poskrbeti za medij  \"%s\" , ker je ta seznam že uporabljen pri "
+"drugem mediju"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - listaj vzporedne vzdevke, ki so na voljo.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"nemogoče je uporabiti ime \"%s\" za neimenovan medij, ker je to že "
+"uporabljeno"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pridobivanje je spodletelo: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"nemogoče je vzeti medij \"%s\" v račun, ker ne obstaja seznam datotek [%s] "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "nemogoče je pregledati seznam datotek za \"%s\", medij je zato prezrt"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "nemogoče je določiti medija te hdlist datoteke [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binarni ALI operator, pravilen če je en izraz pravilen.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "nemogoče je dostopati do datoteka hdlist \"%s\", medij je zato prezrt"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Namestitev paketa..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "nemogoče je dostopati do seznama datotek \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "napačno ime rpm datoteke [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "poskušam preiti obstoječi medij, izogibanje \"%s\""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "napačna napoved posrednika v ukazni vrstici\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"navidezni medij \"%s\" ne sme imeti uporabljen seznam hdlist, medij je zato "
+"prezrt"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d namestitvena transakcija je spodletela"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "navidezni medij \"%s\" mora imeti čisti url, medij je zato prezrt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"nemogoče je dostopati do prvega namestitvenega medija (ni datoteke Mandrake/"
-"base/hdlists )"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "nemogoče je najti hdlist datoteke \"%s\", medij je zato prezrt"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Oprostite, slaba izbira, poskusi znova\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nemogoče je najti seznam datotek \"%s\", medij je zato prezrt"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Izberi mesto za shranjevanje datoteke"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "neurejen seznam datotek za \"%s\", medij je zato prezrt"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - izpiše oznako povzetka: povzetek.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "nemogoče je pregledati seznam datotek za \"%s\", medij je zato prezrt"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sledeči paketi vsebujejo %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "preveč priklopnih točk za izmenljivi medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Namestitev"
+msgid "taking removable device as \"%s\""
+msgstr "izmenljivo napravo vzamem kot \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - uporabi X vmestnik\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "uporabljam drugačno izmenljivo napravo [%s] za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potreben je en od sledečih paketov:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "nemogoče je razrešiti pot za izmenljivi medij \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Zaradi odvisnosti bodo odstranjeni sledeči paketi (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "nemogoče je pisanje nastavitvene datoteke [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - izbere najboljši vmestnik glede na okolje:\n"
-"                   X ali tekstni način.\n"
+msgid "write config file [%s]"
+msgstr "pišem datoteko z nastavitvami [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Pobiranje paketa`%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Ne morem uporabiti vzporednega načina z začinom use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Kaj je lahko narejeno z binarno rpm datoteko pri uporabi --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "nemogoče je razčleniti \"%s\" v datoteki [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - avtomatsko izberi pakete za posodobitev sistema.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "preverjam vzporednega upravljača v datoteki [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "ni paketa poimenovanega %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "najden je vzporedni upravljač za vozlišča: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "uporabljam združen medij za vzporeden način: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Neuspela namestitev, nekatere datoteke so pogrešane:\n"
-"%s\n"
-"Podatkovno bazo urpmi lahko obnovite"
+msgid "unable to use parallel option \"%s\""
+msgstr "nemogoče je uporabiti vzporedno izbiro \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"uporaba: urpmi.removemedia [-a] <ime> ...\n"
-"kjer je <ime> ime medija za odstranitev.\n"
+"--synthesis ne more biti uporabljen z --media, --excludemedia, --sortmedia, "
+"--update or --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Namestitev ne more nadaljevati, ker je potrebno sledeče pakete \n"
-"odstraniti, da bodo drugi posodobljeni:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "preverjam synthesis datoteko [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' manjka za mrežni medij\n"
+msgid "examining hdlist file [%s]"
+msgstr "preverjam hdlist datoteko [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - listaj datoteke v paketi.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "nevidezni medij \"%s\" ni lokalen, medij je zato prezrt"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "neznan paket"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem pri branju synthesis datoteke medija: \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Namestitev je mogoča"
+msgid "performing second pass to compute dependencies\n"
+msgstr "izvajam drugi prehod za izračun odvisnosti\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeči paketi morajo biti odstranjeni zaradi posodabljanj z novejšimi :\n"
-"%s"
+msgid "skipping package %s"
+msgstr "izpuščam paket %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "želiš namestiti namesto nadgraditi paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"nemogoče je vzeti medij \"%s\" v račun, ker ne obstaja seznam datotek [%s] "
+msgid "unable to open rpmdb"
+msgstr "nemogoče odpreti rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" že obstaja"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ne morem dodati distribucije s posodobitvami ali cooker\n"
+msgid "virtual medium need to be local"
+msgstr "navidezni medij mora biti področen"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - zgovoren način.\n"
+msgid "added medium %s"
+msgstr "dodan medij %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Pripravljanje..."
+msgid "unable to access first installation medium"
+msgstr "nemogoče je dostopati do prvega namestitvenega madija"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - listaj pakete na voljo.\n"
+msgid "copying hdlists file..."
+msgstr "kopiranje hdlists datoteke..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - izpiši vse oznake.\n"
+msgid "...copying failed"
+msgstr "...kopiranje je spodletelo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "neurejen medij \"%s\" je označen kot izmenljivi, a ne drži"
+msgid "...copying done"
+msgstr "...kopiranje končano"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"navidezni medij \"%s\" ne sme imeti uporabljen seznam hdlist, medij je zato "
-"prezrt"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "računanje md3sum kopiranega izvora datoteke hdlist (ali synthesis) "
+"nemogoče je dostopati do prvega namestitvenega medija (ni datoteke Mandrake/"
+"base/hdlists )"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - izloči poti ločene z vejico.\n"
+msgid "retrieving hdlists file..."
+msgstr "prinašanje hdlists datoteke..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisni Enter ko boš pripravljen..."
+msgid "...retrieving done"
+msgstr "...pridobivanje je končano"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznane opcije '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...pridobivanje je spodletelo: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --nivo-deljenja  - deli v kratke transakcije če je potrebno \n"
-"                   namestiti ali nadgaraditi več paketov, kot je podano;\n"
-"                   privzeto je %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "napačen opis hdlist \"%s\" v datoteki hdlists"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem pri branju synthesis datoteke medija: \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "poskušal sem izbrati neobstajajoči medij \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - uporabi wget za pobiranje datotek.\n"
+msgid "selecting multiple media: %s"
+msgstr "izbiranje več medijev: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - dovoli iskanje v polje provides da najde paket.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - listaj vozlišča na voljo pri uporabi --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "odstranjevanje medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "gradim hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"nezmožen dostopa do medija \"%s\",\n"
+"to se lahko zgodi, če je tvoj medij ročno priklopljen v imenik ko se medij "
+"kreira."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - če je mogoče ohrani obstoje pakete, zavrni zahtevane\n"
-"                   pakete ki vodijo v odstranjevanje.\n"
+"navidezni medij \"%s\" mora imeti veljaven izvor hdlist ačo symtjesos, medij "
+"je zato prezrt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "preverjanje MD5SUM datoteke"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiranje datoteke z opisi \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ukaz ni najden\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "računanje md5sum obstoječega izvora hdlist (ali synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "nemogoče je registrirati rpm datoteko"
+msgid "examining MD5SUM file"
+msgstr "preverjanje MD5SUM datoteke"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - dovoli si vprašati uporabnika za namestitev paketov brez\n"
-"                   preverjanja odvisnosti.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopiranje izvora (datoteke hdlist ali synthesis) od \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "nemogoče obravnavati protokol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiranje [%s] je spodletelo (datoteke je sumljivo majhna)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "prinašanje hdlists datoteke..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "računanje md3sum kopiranega izvora datoteke hdlist (ali synthesis) "
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Da, res namesti"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "spodletelo je kopiranje [%s] (md5sum se ne ujema)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "dodan medij %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem pri branju synthesis datoteke z medija \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - hrani neuporabljane rpm pakete v medpomniliku.\n"
+msgid "reading rpm files from [%s]"
+msgstr "branje rpm datotek iz [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"narejena transakcija za nameščanje %s (odstrani=%d, namesti=%d, posodobi=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "nemogoče je branje rpm datotek iz [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum se ne ujema"
+msgid "no rpm files found from [%s]"
+msgstr "ni najdenih nič rpm datotek z [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaktična napaka v nastavitveni datoteki v vrstici %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "prinašanje izvora (datoteke hdlist ali synthesis) kot \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ali rpm datoteke podane iz ukazne vrstice bodo nameščene.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "najden prevjerjen seznam (datoteke hdlist ali synthesis) kot %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - upodabi določen HTTP posrednik, vtičnik je domnevno\n"
-"                       privzeto 1080 (format je <posrednik[:vtičnik]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "računanje md5sum izvorne datoteke hdlist ( ali synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "glede na namestitev %s"
+msgid "md5sum mismatch"
+msgstr "md5sum se ne ujema"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "najdenih je %s vnosov v seznamu depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "prinašanje izvora je spodletelo (datoteke hdlist ali synthesis)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nisem našel hdlist zbirke za medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Nemogoče je kreirati imenik [%s] za poročilo o napaki"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "datoteka [%s] je že uporabljena v istam mediju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "želiš namestiti namesto nadgraditi paket %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "nemogoče je razčleniti hdlist medija \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "prinašam zrcalna mesta pri %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "nemogoče je zapisati seznam od \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - izpiše oznako url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "pišem datoteko s seznamom za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "neznan definiran protokol za %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "nč ni napisano v datoteki s seznamom za \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - izpiše različica in izdajo skupaj z imenom.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "preverjanje datoteko z javnimi ključi od \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - izpiše oznako obsoletes: vse obsoletes.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...uvožen je ključ %s iz datoteke javnih ključev od \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" že obstaja"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "nemogoče je uvoziti javni ključ od \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "nameščam %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "berem zglavja iz medija \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"pogrešan je vnos za posodobitev\n"
-"(eden od %s)\n"
+msgid "building hdlist [%s]"
+msgstr "gradim hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "poskušam posodobiti %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "zgrajen je hdlist synthesis za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "nemogoče odstraniti paket %s"
+msgid "found %d headers in cache"
+msgstr "najdenih je %d zglavij v medpomnilniku"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem pri branju synthesis datoteke z medija \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "odstranjujem %d zastarelih zglavij v medpomnilniku"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"pogrešan je vnos za odstranitev \n"
-"(en od %s)\n"
+msgid "mounting %s"
+msgstr "priklaplam %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - izberi celoten medij.\n"
+msgid "unmounting %s"
+msgstr "odklapljam %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Pogrešan je podpis (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "najdenih je %s vnosov v seznamu depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "nemogoče je branje rpm datotek iz [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "ni vnosov v seznamu depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "napačno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiranje [%s] je spodletelo (datoteke je sumljivo majhna)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "prinašam rpm datoteko [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - posodobi samo posodobitveni medij.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "nemogoče je dostopati do rpm datoteke [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr "(D/n)"
+msgid "unable to register rpm file"
+msgstr "nemogoče je registrirati rpm datoteko"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - omeji rezultate za podano skupino.\n"
+msgid "error registering local packages"
+msgstr "napaka pri registraciji lokalnih paketov"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"medij \"%s\" poskuša uporabiti že uporabljen seznam, medij je zato prezrt"
+msgid "no package named %s"
+msgstr "ni paketa poimenovanega %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "spačen vhod: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Sledeči paketi vsebujejo %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "odstranitev paketa %s bo zrušilo tvoj sistem"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "tu je več paketov z istim imenom rpm datoteke \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - listaj medije na voljo.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nemogoče je pravilno razčleniti [%s] pri vrednosti \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Nameščam paket `%s' (%s/%s)..."
+"medij \"%s\" uporablja neveljaven seznam datotek \n"
+"  zrcalno mesto verjetno ni najbolj sodobno, poskušam uporabiti druge načine"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ni vnosov v seznamu depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medij \"%s\" ne beleži kako lokacijo rpm datotek"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - namesti samo izvorni paket (ne binarnih).\n"
+msgid "package %s is not found."
+msgstr "ni najden paket %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uporabi curl za pobiranje datotek.\n"
+msgid "urpmi database locked"
+msgstr "podatkovna baza urpmi je zaklenjena"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vključi perl kodo direktno kot perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" ni označen"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "ali se strinjate ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "nemogoče je brati rpm datoteko [%s] iz medija \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "neurejen seznam datotek za \"%s\", medij je zato prezrt"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "neurejen medij \"%s\" je označen kot izmenljivi, a ne drži"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...pridobivanje je končano"
+msgid "unable to access medium \"%s\""
+msgstr "nemogoče je dostopati do medija \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "dodajanje paketa %s (id=%d, eid=%d, posodobi=%d, datoteka=%s)"
+msgid "malformed input: [%s]"
+msgstr "spačen vhod: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "izpuščam paket %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "pridobivanje rpm datotek iz medija \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Neveljaven podpis (%s)"
+msgid "Preparing..."
+msgstr "Pripravljam..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  imena ali rpm datoteke podane preko ukazne vrstice so obdelane.\n"
+msgid "using process %d for executing transaction"
+msgstr "uporabljam proces %d za izvajanje transakcije"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi različica%s\n"
-"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem "
-"GNUGPL.\n"
-"\n"
-"uporaba:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nemogoče je pravilno razčleniti [%s] pri vrednosti \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne uporabi podane medije, ločene z vejico.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "nemogoče je določiti medija te hdlist datoteke [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "nemogoče je razčleniti hdlist medija \"%s\""
+"narejena transakcija za nameščanje %s (odstrani=%d, namesti=%d, posodobi=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"medij \"%s\" poskuša uporabiti že uporabljen seznam hdlist, medij je zato "
-"prezrt"
+msgid "unable to create transaction"
+msgstr "nemogoče je narediti transakcijo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "glede na konflikte z/s %s"
+msgid "removing package %s"
+msgstr "odstranjevanje paketa %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "odstranjujem %d zastarelih zglavij v medpomnilniku"
+msgid "unable to remove package %s"
+msgstr "nemogoče odstraniti paket %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "nemogoče je posodobiti medij \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "dodajanje paketa %s (id=%d, eid=%d, posodobi=%d, datoteka=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Poizkusi z namestitvijo brez preverjan odvisnosti? (d/N) "
+msgid "unable to install package %s"
+msgstr "nemogoče namestiti paket  %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "nevidezni medij \"%s\" ni lokalen, medij je zato prezrt"
+msgid "due to missing %s"
+msgstr "glede na manjkajoče %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Pripravljam..."
+msgid "due to unsatisfied %s"
+msgstr "zaradi nezadovoljstva %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    prevzeto je %s.\n"
+msgid "trying to promote %s"
+msgstr "poskušam posodobiti %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "uporabljam drugačno izmenljivo napravo [%s] za \"%s\""
+msgid "in order to keep %s"
+msgstr "glede na ohranitev %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe             - ne poskusi najti synthesis ali hdlist\n"
-"                   datoteki.\n"
+msgid "in order to install %s"
+msgstr "glede na namestitev %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne išči v polje provides da najde paket.\n"
+msgid "due to conflicts with %s"
+msgstr "glede na konflikte z/s %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "spodletelo je kopiranje [%s] (md5sum se ne ujema)"
+msgid "unrequested"
+msgstr "nezahtevan"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa.\n"
-"                   To dovoli za povpraševanje distribucije .\n"
+msgid "Invalid signature (%s)"
+msgstr "Neveljaven podpis (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"uporaba: %s [možnosti]\n"
-"kjer so [možnosti] med\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Neveljaven ID ključa (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - odstrani pred drugim dejanjem rpm pakete iz "
-"medpomnilnika.\n"
+msgid "Missing signature (%s)"
+msgstr "Pogrešan je podpis (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"nemogoče je uporabiti ime \"%s\" za neimenovan medij, ker je to že "
-"uporabljeno"
+msgid "bad proxy declaration on command line\n"
+msgstr "napačna napoved posrednika v ukazni vrstici\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - izpiše oznako konfliktov: vse konflikte.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne morem brati rpm datoteke \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"navidezni medij \"%s\" mora imeti veljaven izvor hdlist ačo symtjesos, medij "
-"je zato prezrt"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Oprostite, slaba izbira, poskusi znova\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -916,1091 +829,1224 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - prikaže to sporočilo s pomočjo.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - avtomatsko izbere paket v možnostih.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"uporaba: urpmi.addmedia [opcije] <ime> <url> [z <relativna_pot>]\n"
-"kjer je <url> ena izbira od\n"
-"       file://<pot>\n"
-"       ftp://<uporabniško_ime>:<geslo>@<gostitelj>/<pot> z <relativno potjo  "
-"od hdlist>\n"
-"       ftp://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
-"       http://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
-"       removable://<pot>\n"
-"\n"
-"in so [opcije] iz\n"
+"  --test         - preveri, če je lahko namestitev pravilno dosežena.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopiranje izvora (datoteke hdlist ali synthesis) od \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - prisili v dejanje celo če nekateri paketi ne obstajajo.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiranje končano"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "nemogoče je uporabiti vzporedno izbiro \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - uporabi drug korenski imenik za rpm namestitev.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"medij \"%s\" uporablja neveljaven seznam datotek \n"
-"  zrcalno mesto verjetno ni najbolj sodobno, poskušam uporabiti druge načine"
+"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa, uporabno "
+"je\n"
+"                   za namestitev ali odstranitev z možnostjo --root .\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "nemogoče je dostopati do prvega namestitvenega madija"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - zgovoren način.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "navidezni medij mora biti področen"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "napaka pri registraciji lokalnih paketov"
+msgid "unknown packages"
+msgstr "neznani paketi"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - omeji hitrost pobiranja.\n"
+msgid "unknown package"
+msgstr "neznan paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "najden prevjerjen seznam (datoteke hdlist ali synthesis) kot %s"
+msgid "removing package %s will break your system"
+msgstr "odstranitev paketa %s bo zrušilo tvoj sistem"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "prinašanje izvora je spodletelo (datoteke hdlist ali synthesis)"
+msgid "Nothing to remove"
+msgstr "Ničesr za odstraniti"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ni najdenih nič rpm datotek z [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Preverjam za odstranitev sledečih paketov"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nč ni napisano v datoteki s seznamom za \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Zaradi odvisnosti bodo odstranjeni sledeči paketi (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sledeči paketi imajo slabe podpise"
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "računanje md5sum obstoječega izvora hdlist (ali synthesis)"
+msgid "removing %s"
+msgstr "odstranijevanje %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - izvedi nalogo z odstranitvojo poketov.\n"
+msgid "Removing failed"
+msgstr "Odstranjevanje je spodletelo "
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf različica%s\n"
+"Avtorske pravice (C) 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem GNU "
+"GPL\n"
+"\n"
+"uporaba:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "nemogoče namestiti paket  %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uporabi samo medij za posodobitev.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - uporabi samo podane medije, ločene z vejico.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ne uporabi podane medije, ločene z vejico.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - dovoli si vprašati uporabnika za namestitev paketov "
-"brez \n"
-"                   preverjanja odvisnosti in integritete.\n"
+"  --sortmedia    - medije razvrsti glede na podnize, ločene z vejico.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Shrani datoteko"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne morem brati rpm datoteke \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - zgovorni način.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "nemogoče je pisanje nastavitvene datoteke [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - ne izpiši imena opravila (privzeto, če ni podanega "
+"opravilav ukazni\n"
+"                   vrstici, nezdružljivo z interaktivnim načinom).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ne izpiši identičnih vrstic.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Neveljaven ID ključa (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - izpiši vse oznake.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - prisili v dejanje celo če nekateri paketi ne obstajajo.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - izpiše oznako skupine: skupina.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "nemogoče je razrešiti pot za izmenljivi medij \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - izpiše oznako velikosti: velikost.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - poskusi najti in uporabiti synthesis datoteko.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - izpiše oznako epoch: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - izpiše oznako povzetka: povzetek.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    -prisili posodobitev ključa gpg.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - izpiše oznako opisa: opis.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativna pot do hdlist> je pogrešanja\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - izpiše oznako sourcerpm: izvorni rpe.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Preverjam za odstranitev sledečih paketov"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - izpiše oznako packager: kdo je naredil paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "nezahtevan"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - izpiše oznako buildhost: strežnik, kjer je bil paket "
+"zgrajen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "nemogoče je dostopati do rpm datoteke [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - izpiše oznako url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - izpiše oznako datoteke: vse datoteke.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - izpiše oznako provides: vse provides.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "nemogoče je razčleniti \"%s\" v datoteki [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - izpiše oznako requires: vse requires.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ali želite nadaljevati namestitev ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - izpiše oznako datoteke: vse datoteke.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "nemogoče je brati rpm datoteko [%s] iz medija \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - izpiše oznako konfliktov: vse konflikte.\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - izpiše oznako obsoletes: vse obsoletes.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa, uporabno "
-"je\n"
-"                   za namestitev chroot z možnostjo --root .\n"
+"  --env          - uporabi specifično okolje (tipično poročilo\n"
+"                   o napaki).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "zgrajen je hdlist synthesis za medij \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - izpiše uporabne informacije v človeku umljivem zapisu.\n"
+"  -f             - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - uporabi podano različica distribucije, privzeto je vzeta\n"
-"                   iz različice distribucije dobljene pri namestitvi\n"
-"                   paketa mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vključi perl kodo direktno kot perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - uporabi podan url za dobiti seznam zrcalnih mest, "
-"privzeto je\n"
-"                   %s\n"
+"  -a             - binarni IN operator, pravilen če sta pravilna oba "
+"izraza.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa, uporabno "
-"je\n"
-"                   za namestitev ali odstranitev z možnostjo --root .\n"
+"  -o             - binarni ALI operator, pravilen če je en izraz pravilen.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - NOT operator, pravilen če je izraz napačen.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - levi oklepaj za odpiranje skupine izrazov.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - desni oklepaj za zapiranje skupine izrazov.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Imenik %s] že obstaja, prosim vas da uporabite drugega za poročilo o napaki "
-"ali pa ga izbrišite"
+"klic nazaj je :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "odklapljam %s"
+msgid "using specific environment on %s\n"
+msgstr "uporabljam specifično okolje pri %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nič ni za posodobit (uporabi urpmi.addmedia da dodaš nov medij)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% končano, hitrost = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi različica%s\n"
+"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem "
+"GNUGPL.\n"
+"\n"
+"uporaba:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "ponovno zaganjam urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "preverjam synthesis datoteko [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - avtomatsko izberi pakete za posodobitev sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Poizkusi s strogo namestitvijo (--force)? (d/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nikoli ne vprašaj za odstranitev paketa,  prekini takrat "
+"namestitev.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiranje je spodletelo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - če je mogoče ohrani obstoje pakete, zavrni zahtevane\n"
+"                   pakete ki vodijo v odstranjevanje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "nemogoče je dostopati do datoteka hdlist \"%s\", medij je zato prezrt"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --nivo-deljenja  - deli v kratke transakcije če je potrebno \n"
+"                   namestiti ali nadgaraditi več paketov, kot je podano;\n"
+"                   privzeto je %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi način.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - majhna velikost transakcij, privzeto je %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - zgovorni način.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - vsili ohlapno iskanje (isto kot -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - daj vse izvorne pakete pred pobiranjem dol (samo root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - naslednji paket je izvorni paket (isto kot -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - razširi glave paketa listane iz urpmi baze na\n"
-"                   stdout (samo root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - namesti samo izvorni paket (ne binarnih).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "neznani paketi"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - odstrani pred drugim dejanjem rpm pakete iz "
+"medpomnilnika.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "izbiranje več medijev: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - hrani neuporabljane rpm pakete v medpomniliku.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
+"  --allow-nodeps - dovoli si vprašati uporabnika za namestitev paketov brez\n"
+"                   preverjanja odvisnosti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "datoteka [%s] je že uporabljena v istam mediju \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - dovoli si vprašati uporabnika za namestitev paketov "
+"brez \n"
+"                   preverjanja odvisnosti in integritete.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ničesar za odstraniti (uporabi urpmi.addmedia za dodajanje medija)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa, uporabno "
+"je\n"
+"                   za namestitev chroot z možnostjo --root .\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nemogoče je najti seznam datotek \"%s\", medij je zato prezrt"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uporabi wget za pobiranje datotek.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - prikaže to sporočilo s pomočjo.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uporabi curl za pobiranje datotek.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "najden je vzporedni upravljač za vozlišča: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - omeji hitrost pobiranja.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"klic nazaj je :\n"
-"%s\n"
+"  --resume       - nadaljuje prenos delno pobranih datotek\n"
+"                   (--no-resume onemogoča to, privzeto je onemogočeno).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - iskanje po nazaj kar paket potrebuje.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - upodabi določen HTTP posrednik, vtičnik je domnevno\n"
+"                       privzeto 1080 (format je <posrednik[:vtičnik]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf različica%s\n"
-"Avtorske pravice (C) 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem GNU "
-"GPL\n"
-"\n"
-"uporaba:\n"
+"  --proxy-user   - določi uporabnika in geslo za uporabo avtentifikacije\n"
+"                   pri posredniku (formatje <uporabnik:geslo>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - ne izpiši imena opravila (privzeto, če ni podanega "
-"opravilav ukazni\n"
-"                   vrstici, nezdružljivo z interaktivnim načinom).\n"
+"  --bug          - pripravi poročilo o napaki v imenik prikazanem z\n"
+"                   naslednjim argumentom.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ne izpiši identičnih vrstic.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - uporabi X vmestnik\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis ne more biti uporabljen z --media, --excludemedia, --sortmedia, "
-"--update or --parallel"
+"  --best-output  - izbere najboljši vmestnik glede na okolje:\n"
+"                   X ali tekstni način.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - uporabi določeno platformo, kot privzeta arhitekturo se "
-"vzame\n"
-"                   tista, ki jo ima nameščen paket mandrake-release .\n"
+"  --verify-rpm   - preveri rpm podpis pred namestitvijo\n"
+"                   (--no-verify-rpm onemogoči, privzeto omogočen).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Je to v redu?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - izloči poti ločene z vejico.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - izkljiči datoteke z dokumentacijo.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - uporabi tale dan synthesis namesti urpmi baze.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "preverjam vzporednega upravljača v datoteki [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - dovoli iskanje v polje provides da najde paket.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ničesr za odstraniti"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne išči v polje provides da najde paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...uvožen je ključ %s iz datoteke javnih ključev od \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - vsili ohlapno iskanje (isto kot --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "berem zglavja iz medija \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - naslednji paket je izvorni paket (isto kot --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - razširi poizvedbo na paketove odvisnosti.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi način.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - pripravi poročilo o napaki v imenik prikazanem z\n"
-"                   naslednjim argumentom.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ali rpm datoteke podane iz ukazne vrstice bodo nameščene.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medij \"%s\" ne beleži kako lokacijo rpm datotek"
+msgid "Choose location to save file"
+msgstr "Izberi mesto za shranjevanje datoteke"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - izpiše oznako sourcerpm: izvorni rpe.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Kaj je lahko narejeno z binarno rpm datoteko pri uporabi --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "nemogoče je zapisati seznam od \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Izbrali ste izvorni paket:\n"
+"\n"
+"%s\n"
+"\n"
+"Verjetno ga niste hoteli namestiti na sistemu (njegova namestitev bi\n"
+"vam dovolila narediti spremembe v izvorno kodo za kasnejše prevajanje).\n"
+"\n"
+"Kaj bi želeli narediti?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - izpiše oznako requires: vse requires.\n"
+msgid "Do nothing"
+msgstr "Ne naredi nič"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "poskušal sem izbrati neobstajajoči medij \"%s\""
+msgid "Yes, really install it"
+msgstr "Da, res namesti"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - izpiše oznako opisa: opis.\n"
+msgid "Save file"
+msgstr "Shrani datoteko"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiranje je spodletelo"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Ste pri namestitvi sledečega programa na vaš sistem:\n"
+"\n"
+"%s\n"
+"\n"
+"Mogoče bi ga raje samo shranili. Kakšna je vaša izbira?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - prisili tvorbo hdlist datotek.\n"
+msgid "Install it"
+msgstr "Namestitev"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Imenik %s] že obstaja, prosim vas da uporabite drugega za poročilo o napaki "
+"ali pa ga izbrišite"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nisem našel hdlist zbirke za medij \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Nemogoče je kreirati imenik [%s] za poročilo o napaki"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - naslednji paket je izvorni paket (isto kot --src).\n"
+msgid "Copying failed"
+msgstr "Kopiranje je spodletelo"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "nameščam %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo superuporabniku je dovoljeno nameščati pakete"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "branje rpm datotek iz [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Potreben je en od sledečih paketov:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiranje datoteke z opisi \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Kakšna je tvoja izbira? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - avtomatsko izbere paket v možnostih.\n"
+msgid "Package installation..."
+msgstr "Namestitev paketa..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Odstranjevanje je spodletelo "
+msgid "Initializing..."
+msgstr "Pripravljanje..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - kreiraj navidezni medij, ki je vedno posodabljan,\n"
-"                   samo file:// protokol je dovoljeno.\n"
+"Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "ni najden paket %s"
+msgid "do you agree ?"
+msgstr "ali se strinjate ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "odstranjevanje medij \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Namestitev ne more nadaljevati, ker je potrebno sledeče pakete \n"
+"odstraniti, da bodo drugi posodobljeni:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ni potrebe dajati <relativna pot do hdlist> z --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeči paketi morajo biti odstranjeni zaradi posodabljanj z novejšimi :\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Za zadovolitev odvisnosti nameravam namestiti naslednje pakete (%d MB)"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Prekliči"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Moraš biti prijavljen kot root za namestitev sledečih odvisti:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - naslednji paket je izvorni paket (isto kot -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "nemogoče je dobiti izvorne pakete, preklic"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - uporabi specifično okolje (tipično poročilo\n"
-"                   o napaki).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Prosim vstavi medij poimenovan \"%s\" v napravo [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - medije razvrsti glede na podnize, ločene z vejico.\n"
+msgid "Press Enter when ready..."
+msgstr "Pritisni Enter ko boš pripravljen..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "nemogoče je dostopati do medija \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "Pobiranje paketa`%s'..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "nemogoče je kreirati medij \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% od %s končano ETA= %s, hitrost= %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - izpiše oznako packager: kdo je naredil paket.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% končano, hitrost = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - izvrži nastavitve v formatu za urpmi.addmedia.\n"
+msgid "The following packages have bad signatures"
+msgstr "Sledeči paketi imajo slabe podpise"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ali želite nadaljevati namestitev ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Moraš biti prijavljen kot root za namestitev sledečih odvisti:\n"
+"Neuspela namestitev, nekatere datoteke so pogrešane:\n"
 "%s\n"
+"Podatkovno bazo urpmi lahko obnovite"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - izpiše zgodovino sprememb.\n"
+msgid "Installation failed"
+msgstr "Neuspela namestitev"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "nemogoče je dostopati do seznama datotek \"%s\", medij je zato prezrt"
+msgid "distributing %s"
+msgstr "dostavljanje %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - desni oklepaj za zapiranje skupine izrazov.\n"
+msgid "installing %s"
+msgstr "nameščam %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Nameščam paket `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "preverjam hdlist datoteko [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Poizkusi z namestitvijo brez preverjan odvisnosti? (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopiranje hdlists datoteke..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Poizkusi s strogo namestitvijo (--force)? (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "pišem datoteko s seznamom za medij \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d namestitvena transakcija je spodletela"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "navidezni medij \"%s\" mora imeti čisti url, medij je zato prezrt"
+msgid "Installation is possible"
+msgstr "Namestitev je mogoča"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "Vse je že nameščeno"
+
+#: ../urpmi:797
+#, c-format
+msgid "restarting urpmi"
+msgstr "ponovno zaganjam urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
-"  --buildhost    - izpiše oznako buildhost: strežnik, kjer je bil paket "
-"zgrajen.\n"
+"uporaba: urpmi.addmedia [opcije] <ime> <url> [z <relativna_pot>]\n"
+"kjer je <url> ena izbira od\n"
+"       file://<pot>\n"
+"       ftp://<uporabniško_ime>:<geslo>@<gostitelj>/<pot> z <relativno potjo  "
+"od hdlist>\n"
+"       ftp://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
+"       http://<gostitelj>/<pot> z<relativno_potjo_od_hdlist>\n"
+"       removable://<pot>\n"
+"\n"
+"in so [opcije] iz\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "Do nothing"
-msgstr "Ne naredi nič"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - kreiraj medij za posodabljanje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "uporabljam združen medij za vzporeden način: %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - poskusi najti in uporabiti synthesis datoteko.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "mounting %s"
-msgstr "priklaplam %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - poizkusi najti in uporabiti hdlist datoteko.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"nemogoče je poskrbeti za medij  \"%s\" , ker je ta seznam že uporabljen pri "
-"drugem mediju"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "nemogoče je dobiti izvorne pakete, preklic"
+"  --no-probe             - ne poskusi najti synthesis ali hdlist\n"
+"                   datoteki.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - uporabi drug korenski imenik za rpm namestitev.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - avtomatsko kreiraj vse medije iz namestitvenega\n"
+"                   medija.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% od %s končano ETA= %s, hitrost= %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - avtomatsko kreiraj medij za XXX del\n"
+"                   distribucije, XXX so lahko glavni mediji, prispevki, "
+"posodobitve ali\n"
+"                   karkoli drugega, kar je bilo pripravljeno ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "računanje md5sum izvorne datoteke hdlist ( ali synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - uporabi podan url za dobiti seznam zrcalnih mest, "
+"privzeto je\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "nemogoče je uvoziti javni ključ od \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - uporabi podano različica distribucije, privzeto je vzeta\n"
+"                   iz različice distribucije dobljene pri namestitvi\n"
+"                   paketa mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nikoli ne vprašaj za odstranitev paketa,  prekini takrat "
-"namestitev.\n"
+"  --arch         - uporabi določeno platformo, kot privzeta arhitekturo se "
+"vzame\n"
+"                   tista, ki jo ima nameščen paket mandrake-release .\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq različica%s\n"
-"Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem GNU "
-"GPL.\n"
-"\n"
-"uporaba:\n"
+"  --virtual      - kreiraj navidezni medij, ki je vedno posodabljan,\n"
+"                   samo file:// protokol je dovoljeno.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "prinašanje izvora (datoteke hdlist ali synthesis) kot \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
+"  --md5sum-ne-obstaja    - preverjanje datoteke z MD5SUM onemogočeno.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - izpiše skupine skupaj z imenom.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - počisti imenik z medpomnilnikom zglavij.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" ni označen"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - prisili tvorbo hdlist datotek.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo superuporabniku je dovoljeno nameščati pakete"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ne morem dodati distribucije s posodobitvami ali cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "uporabljam specifično okolje pri %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "prinašam zrcalna mesta pri %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "nemogoče je najti hdlist datoteke \"%s\", medij je zato prezrt"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ni potrebe dajati <relativna pot do hdlist> z --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - majhna velikost transakcij, privzeto je %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "nemogoče je posodobiti medij \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - levi oklepaj za odpiranje skupine izrazov.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativna pot do hdlist> je pogrešanja\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "preveč priklopnih točk za izmenljivi medij \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' manjka za mrežni medij\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binarni IN operator, pravilen če sta pravilna oba "
-"izraza.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "nemogoče je kreirati medij \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"nezmožen dostopa do medija \"%s\",\n"
-"to se lahko zgodi, če je tvoj medij ročno priklopljen v imenik ko se medij "
-"kreira."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - izpiše oznako skupine: skupina.\n"
+"uporaba: urpmi.removemedia [-a] <ime> ...\n"
+"kjer je <ime> ime medija za odstranitev.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - uporabi samo podane medije, ločene z vejico.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - izberi celoten medij.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "nemogoče je narediti transakcijo"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznane opcije '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "pridobivanje rpm datotek iz medija \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ničesar za odstraniti (uporabi urpmi.addmedia za dodajanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Izbrali ste izvorni paket:\n"
-"\n"
-"%s\n"
-"\n"
-"Verjetno ga niste hoteli namestiti na sistemu (njegova namestitev bi\n"
-"vam dovolila narediti spremembe v izvorno kodo za kasnejše prevajanje).\n"
-"\n"
-"Kaj bi želeli narediti?"
+"pogrešan je vnos za odstranitev \n"
+"(en od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "dostavljanje %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"uporaba: urpmi.update [opcije] <ime> ...\n"
+"kjer je <ime> ime medija za posodabljanje.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Neuspela namestitev"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - posodobi samo posodobitveni medij.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "pišem datoteko z nastavitvami [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    -prisili posodobitev ključa gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 "  -a             - izberi vse ne-izmenljive medije (niso na CD-ROM-ih).\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - izpiše oznako epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "nič ni za posodobit (uporabi urpmi.addmedia da dodaš nov medij)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - preveri rpm podpis pred namestitvijo\n"
-"                   (--no-verify-rpm onemogoči, privzeto omogočen).\n"
+"pogrešan je vnos za posodobitev\n"
+"(eden od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf različica%s\n"
+"Avtorske pravice (C) 2002 MandrakeSoft.\n"
+"To je prosta programska oprame in se sme razmnoževati pod dovoljenjem GNU "
+"GPL\n"
+"\n"
+"uporaba:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Prosim vstavi medij poimenovan \"%s\" v napravo [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - listaj pakete na voljo.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreiraj medij za posodabljanje.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - listaj medije na voljo.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media   - listaj medije na voljo in njihovega url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - vsili ohlapno iskanje (isto kot --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "V redu"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config  - izvrži nastavitve v formatu za urpmi.addmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "napačen opis hdlist \"%s\" v datoteki hdlists"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - listaj vozlišča na voljo pri uporabi --parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "odstranijevanje %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - listaj vzporedne vzdevke, ki so na voljo.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - avtomatsko kreiraj medij za XXX del\n"
-"                   distribucije, XXX so lahko glavni mediji, prispevki, "
-"posodobitve ali\n"
-"                   karkoli drugega, kar je bilo pripravljeno ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - izpiše oznako velikosti: velikost.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "glede na ohranitev %s"
+"  --headers      - razširi glave paketa listane iz urpmi baze na\n"
+"                   stdout (samo root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "zaradi nezadovoljstva %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - daj vse izvorne pakete pred pobiranjem dol (samo root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Samodejno nameščanje paketov\n"
-"Vi ste zahtevali namestitev paketa %s\n"
+"  --use-distrib  - nastavi na licu mesta urpmi iz distrib drevesa.\n"
+"                   To dovoli za povpraševanje distribucije .\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "podatkovna baza urpmi je zaklenjena"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - izpiše zgodovino sprememb.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - nadaljuje prenos delno pobranih datotek\n"
-"                   (--no-resume onemogoča to, privzeto je onemogočeno).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - razširi poizvedbo na paketove odvisnosti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "preverjanje datoteko z javnimi ključi od \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - odstrani paket, če je novejši ženameščen.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
-"  --md5sum-ne-obstaja    - preverjanje datoteke z MD5SUM onemogočeno.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - izvedi nalogo z odstranitvojo poketov.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "izmenljivo napravo vzamem kot \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - iskanje po nazaj kar paket potrebuje.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Ste pri namestitvi sledečega programa na vaš sistem:\n"
-"\n"
-"%s\n"
-"\n"
-"Mogoče bi ga raje samo shranili. Kakšna je vaša izbira?"
+"  -i             - izpiše uporabne informacije v človeku umljivem zapisu.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - vsili ohlapno iskanje (isto kot -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - izpiše skupine skupaj z imenom.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - odstrani paket, če je novejši ženameščen.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - izpiše različica in izdajo skupaj z imenom.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - poizkusi najti in uporabiti hdlist datoteko.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - listaj datoteke v paketi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "glede na manjkajoče %s"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  imena ali rpm datoteke podane preko ukazne vrstice so obdelane.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uporabi samo medij za posodobitev.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes je lahko uporabljeno samo z --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"uporaba: urpmi.update [opcije] <ime> ...\n"
-"kjer je <ime> ime medija za posodabljanje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "poskušam preiti obstoječi medij, izogibanje \"%s\""
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - preveri, če je lahko namestitev pravilno dosežena.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Za namestitev je potreben en od sledečih paketov %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq različica%s\n"
+#~ "Avtorske pravice (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "To je prosta programska oprame in se sme razmnoževati pod dovoljenjem GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "uporaba:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Neznano spletno prenašanje `%s' !!!\n"
diff --git a/po/sq.po b/po/sq.po
index 03f52ab4..1493c148 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\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"
@@ -33,877 +33,779 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "instalimi i %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - krijo automatikisht të gjitha burimet nga një\n"
-"                   burim instalues.\n"
+"Instalim automatikë i pakove...\n"
+"Ju keni kërkuar instalimin e pakove %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "e pa mundur hapja e rpmdb"
+msgid "Is this OK?"
+msgstr "Është kjo në rregull?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Një nga pakot e radhitura duhet të instalohet %s:"
+msgid "Cancel"
+msgstr "Anulo"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "zhdukja e pakos %s"
+msgid " (Y/n) "
+msgstr " (P/j) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: ky urdhër mungon\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Gjdo gjë është veçse e instaluar"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - shtype këtë lajmë ndihmues.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - çfaqe etiketën group: grupi.\n"
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - shpalosi pakotë lira.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - pastrim i majave në repertort e fshehtë.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protokol i pa njoftur për përcaktimit e %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "përdorimi i procesit %d për ekzekutimin e transakcionit"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
+msgid "unable to handle protocol: %s"
+msgstr "i pa mundur përdorimi i protokolit: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Cila është zgedhja e juaj? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "gabim i sintaksës në skedaren e konfigurimit në rreshtin %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "gjetja e majës %d në fshehje"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "burimi \"%s\" përpiqet të përdorë hdlist përdoruese, burim i injoruar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "ekzistojnë pako të shumta me emër të njëjtë skedareje në rpm \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "burimi \"%s\" përpiqet ta përdorë listën përdoruese, burim i injoruar"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - specifiko përdoruesin dhe parullën për përdorimin e "
-"proxy\n"
-"                   me vërtetim (forma është <user:password>).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "ekzekutim i dytë për ti mbledhur mvarjet\n"
+"e pa mundur kujdesja e burimit \"%s\" lista e skedares përdoret nga një "
+"burim tjetër"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "rikuperimi i skedareve rpm [%s]..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"i pa mundur përdorimi i emrit \"%s\" për burim të pa emruar sepse ky emër "
+"është në përdorim e sipër"
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
-"  --list-aliass   - shpalosi burimet e lira paralele me pseudonime të "
-"njëjta.\n"
+"e pa mundur marrja në përsipër e llogarisë \"%s\" sepse asnjë skedare e "
+"listë [%s] nuk ekziston"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...rikuperimi dështoi: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "i pa mundur caktimi i burimit të kësaj skedareje hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "i pa mundur konsultimi i skedares-list \"%s\", burim i injoruar"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "e pa mundur hyrja në skedaren hdlist të \"%s\", burim i injoruar"
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - operues OR binar, saktësi nëse njëra nga shprehjet është "
-"e saktë.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "e pa mundur hyrja në skedaren e listës të \"%s\", burim i injoruar"
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Instalimi i pakos..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "tentim në kalimin e një burimit ekzistues \"%s\", ndërprerje"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "emri i skedares rpm është invalid [%s]"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"burimi virtuel \"%s\" nuk duhet të posedoj hdlist të përcaktuar apo skedaren "
+"list, burim i injoruar"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"burimi virtuel \"%s\" duhet të posedoj një url të qartë, burim i injoruar"
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "Instalimi i transmetimit të %d dështio"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "e pa mundur gjetja e skedarës hdlist të \"%s\", burim i injoruar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
-"Mandrake/base/hdlists)"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "e pa mundur gjetja e skedares listës të \"%s\", burim i injoruar"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "skedare e listës së ngatërruar për \"%s\", burim i injoruar"
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "i pa mundur konsultimi i skedares-list \"%s\", burim i injoruar"
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "shumë pika montuese për burimin tërheqës \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Pakot e radhitura përmbajnë %s: %s"
+msgid "taking removable device as \"%s\""
+msgstr "marrje e mjetit tërheqës si \"%s\""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalimi dështio"
+#: ../urpm.pm:347
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Një nga pakot e radhitura nevojitet:"
+msgid "unable to write config file [%s]"
+msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
+msgid "write config file [%s]"
+msgstr "shkruaja e skedares konfiguruese [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  --best-output  - zgjedheni sipërfaqen më të mirë në funksion të\n"
-"                   mjedisit: X apo në modë teksti.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Shkarkimi i pakos `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-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"
+msgid "examining parallel handler in file [%s]"
+msgstr "kontrollimi i përkrahjes në skedaren paralele [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "gjetja e përkrahjes në nyjet paralele: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "asnjë pako e emruar %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "përdorimi i burimit të lidhur për modë paralel: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "i pa mundur përdorimi i opcionit paralel \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Instalimi dështoi, disa skedare mungojnë:\n"
-"%s\n"
-"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
+"--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
+"update or --paralle"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"përdorim:urmpi.removemedia [-a] <emri> ...\n"
-"ku <emri> është një burim për zhdukje.\n"
+msgid "examining synthesis file [%s]"
+msgstr "kontrollimi i skedares sintezë [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalimin nuk mund të vazhdoj më tutje, sepse pakot a radhitura duhet\n"
-"të zhduken që të tjerat të azhurnohen:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "kontrollimi i skedares hdlist [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "direktivë `me' mungon burimi i rrjetit\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - shpalosi pakotë lira.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "burimi virtuel\"%s\" nuk është lokal, burim i injoruar"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "pako e pa njoftur"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem gjatë leximit të skedares hdlist po sintezë të burimit \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalimi është i mundur"
+msgid "performing second pass to compute dependencies\n"
+msgstr "ekzekutim i dytë për ti mbledhur mvarjet\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "kalimi i pakos %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Për ti përmbushur mvarësit, pakot e radhitura duhet të instalohen (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"e pa mundur marrja në përsipër e llogarisë \"%s\" sepse asnjë skedare e "
-"listë [%s] nuk ekziston"
+msgid "unable to open rpmdb"
+msgstr "e pa mundur hapja e rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (p/J)"
+msgid "medium \"%s\" already exists"
+msgstr "burimi \"%s\" ekziston me heret"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "nuk mund të shtoj azhurnime në shpërndarësinë cooker\n"
+msgid "virtual medium need to be local"
+msgstr "burimi virtuel duhet të jetë lokal"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - model oratori.\n"
+msgid "added medium %s"
+msgstr "shtuarja e burimit %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Inicializimi..."
+msgid "unable to access first installation medium"
+msgstr "hyrja e pa mundur në burimin e parë instalues"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - shpalosi pakotë lira.\n"
+msgid "copying hdlists file..."
+msgstr "kopjimi i skedares hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+msgid "...copying failed"
+msgstr "...kopjimi dështoi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"burim i ngatërruar \"%s\" është i shënuar si levizës, në të vërtet nuk është"
+msgid "...copying done"
+msgstr "...kopjimi i bërë"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"burimi virtuel \"%s\" nuk duhet të posedoj hdlist të përcaktuar apo skedaren "
-"list, burim i injoruar"
+"hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
+"Mandrake/base/hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "llogaritja md5sum e kopjimit të burimit hdlist (ose sintezës)"
+msgid "retrieving hdlists file..."
+msgstr "rikuperimi i skedares hdlist..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - përdori vetëm burimet e ndara me presje.\n"
+msgid "...retrieving done"
+msgstr "...rikuperim i bërë"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
+msgid "...retrieving failed: %s"
+msgstr "...rikuperimi dështoi: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"opcione të pa njoftura '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "përshkrimi \"%s\" i pa pranueshëm për skedaret hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - ndrarje në trans-akcion nëse më shumë se një pako e "
-"dhënë\n"
-"                   instalohet apo uzhurnohet,\n"
-"                   me marrëveshje është %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem gjatë leximit të skedares hdlist po sintezë të burimit \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "zgjedhje të shumta burimesh: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "zhdukja e burimit \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
+"blokon hyrjen në burimin \"%s\",\n"
+"kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
+"burim."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - shpalosi nyjet kur ato përdoren në --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"burimi virtuel \"%s\" duhet të posedoj një burim hdlist apo sintezë, burim i "
+"injoruar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "krijimi i hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kopjimi i skedares përshkruese të \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep\t  - nëse ka mundësi i mbanë pakot prezente, refuzon pakot\n"
-"\t\t    e kërkuara me drejtim zhdukje.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "llogaritja md5sum e burimit ekzistues në hdlist (ose sintezës)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "kontrollim i skedares MD5SUM"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ky urdhër mungon\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "unable to register rpm file"
-msgstr "i pa mundur regjistrimi i skedares rpm"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopjimi i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - mundëson që përdoruesi në pytje të instaloj\n"
-"                   pakot pas i verifikuar mvarësit e tyre.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "i pa mundur përdorimi i protokolit: %s"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "llogaritja md5sum e kopjimit të burimit hdlist (ose sintezës)"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "rikuperimi i skedares hdlist..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopjimi i [%s] dështoi"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "shtuarja e burimit %s"
+msgid "reading rpm files from [%s]"
+msgstr "lexim i skedareve rpm nga [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - mbane rpm dhe mos e përdor në fshehje.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "leximi i skedares rpm është i pa mundur nga [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
-"%d, upgrade=%d)"
+msgid "no rpm files found from [%s]"
+msgstr "asnjë skedare rpm e gjetur nga [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr "mos pajtim i md5sum"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "gabim i sintaksës në skedaren e konfigurimit në rreshtin %s"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  emrat apo skedaret rpm në linjën komanduese do të instalohen.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - përdore proxy HTTP, numri i portës është i supozuar të\n"
-"                   jetë 1080 në marrëveshje (forma është <proxyhost[:port]"
-">).\n"
+msgid "md5sum mismatch"
+msgstr "mos pajtim i md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "in order to install %s"
-msgstr "në urdhër për instalim %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "rikuperimi i burimit hdlist (ose sintezës) dështoi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "hyrjet %s zhvendosen në depslist"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "skedarja [%s] është në përdorim nga i njëjti burim \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, 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)"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "analizimi i hdlist është i pa mundur të \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
+msgid "unable to write list file of \"%s\""
+msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "rikuperimi i pasqyreve në %s..."
+msgid "writing list file for medium \"%s\""
+msgstr "shkruarja e skedares për listën e burimit \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url        - çfaqe etiketën serial: url.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "asgjë s'është shkruar në skedaren list \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protokol i pa njoftur për përcaktimit e %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "verifimi i skedares pubkey të \"%s\"..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - çfaqe versionin me hollësi, njashtu dhe emrin.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "burimi \"%s\" ekziston me heret"
+msgid "reading headers from medium \"%s\""
+msgstr "leximi i majës nga burimi \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "instalimi i %s\n"
+msgid "building hdlist [%s]"
+msgstr "krijimi i hdlist [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"hyrja për azhurnim mungon\n"
-"(një nga %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "krijimi i skedares sintezë për burimin \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr "tentim në gradimin e %s"
+msgid "found %d headers in cache"
+msgstr "gjetja e majës %d në fshehje"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "e pa mundur zhdukja e pakos %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "zhdukja e majave absolute %d në fshehje"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
+msgid "mounting %s"
+msgstr "montimi i %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"hyrja zhdukëse mungon\n"
-"(një nga %s)\n"
+msgid "unmounting %s"
+msgstr "demontimi i %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - zgjidhi të gjitha burimet.\n"
+msgid "relocated %s entries in depslist"
+msgstr "hyrjet %s zhvendosen në depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Mungon nënshkrimi (%s)"
+msgid "no entries relocated in depslist"
+msgstr "asnjë hyrje e zhvendosur në depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "leximi i skedares rpm është i pa mundur nga [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "emri i skedares rpm është invalid [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "rikuperimi i skedareve rpm [%s]..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "e pa mundur hyrja në skedaren rpm [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - azhurno vetëm burimet azhurnuese.\n"
+msgid "unable to register rpm file"
+msgstr "i pa mundur regjistrimi i skedares rpm"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (P/j) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - çfaqe etiketën group: grupi.\n"
+msgid "error registering local packages"
+msgstr "gabim gjatë regjistrimit të pakove lokale"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "burimi \"%s\" përpiqet ta përdorë listën përdoruese, burim i injoruar"
+msgid "no package named %s"
+msgstr "asnjë pako e emruar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "hyrje e çformuarë: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Pakot e radhitura përmbajnë %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "ekzistojnë pako të shumta me emër të njëjtë skedareje në rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - shpalosi burimet e lira.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "nuk mund të analizohet në mënyrë korrekte [%s] në vlerën \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instalimi i pakove `%s' (%s/%s)..."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "no entries relocated in depslist"
-msgstr "asnjë hyrje e zhvendosur në depslist"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalo vetëm burimet e pakove (jo binare).\n"
+"burimi \"%s\" përdore një listë skedaresh invalide:\n"
+" pasqyra nuk mund të azhurnohet, provoni ta përdorni metodën altenative"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
-"  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
+"burimi \"%s\" nuk ka kurrëfar difinicioni për lokalizimin e skedareve rpm "
 
-#: ../urpmf:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
+msgid "package %s is not found."
+msgstr "pakoja %s nuk është prezente"
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "do you agree ?"
-msgstr "a pajtoheni ?"
+msgid "urpmi database locked"
+msgstr "baza e të dhënave urpmi është e mbyllur"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "skedare e listës së ngatërruar për \"%s\", burim i injoruar"
+msgid "medium \"%s\" is not selected"
+msgstr "burimi \"%s\" nuk është i zgjedhur"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "...retrieving done"
-msgstr "...rikuperim i bërë"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "i pa mundur leximi i skedares [%s] nga burimi \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "shtimi i pakove %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"burim i ngatërruar \"%s\" është i shënuar si levizës, në të vërtet nuk është"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "skipping package %s"
-msgstr "kalimi i pakos %s"
+msgid "unable to access medium \"%s\""
+msgstr "hyrje e pa mundur në burimin \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Nënshkrim i pa pranueshëm (%s)"
+msgid "malformed input: [%s]"
+msgstr "hyrje e çformuarë: [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  emrat apo skedaret rpm të marra në linjën komanduese janë nën hetim.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urmpi versioni %s\n"
-"E drejtë e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ky është një softver gratis dhe mund të rishpërndahet ndër termet e GNU "
-"GPL.\n"
-"\n"
-"përdorim:\n"
+msgid "Preparing..."
+msgstr "Përgatitje..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "nuk mund të analizohet në mënyrë korrekte [%s] në vlerën \"%s\""
+msgid "using process %d for executing transaction"
+msgstr "përdorimi i procesit %d për ekzekutimin e transakcionit"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia        - mos i përdor vetëm burimet e dhëna, të ndara me "
-"presje.\n"
+"krijimi i një akcioni transmetues për një instalim në %s (remove=%d, install="
+"%d, upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "i pa mundur caktimi i burimit të kësaj skedareje hdlist [%s]"
+msgid "unable to create transaction"
+msgstr "i pa mundur krijimi i një akcioni transmetues"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "analizimi i hdlist është i pa mundur të \"%s\""
+msgid "removing package %s"
+msgstr "zhdukja e pakos %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "burimi \"%s\" përpiqet të përdorë hdlist përdoruese, burim i injoruar"
+msgid "unable to remove package %s"
+msgstr "e pa mundur zhdukja e pakos %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "ka arritur gjatë konflikteve me %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "shtimi i pakove %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "zhdukja e majave absolute %d në fshehje"
+msgid "unable to install package %s"
+msgstr "i pa mundur instalimi i pakos %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "i pa mundur azhurnimi i burimit \"%s\"\n"
+msgid "due to missing %s"
+msgstr "ka arritur nga mungesa %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
+msgid "due to unsatisfied %s"
+msgstr "ka arritur gjatë mosmarrëveshjes %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "burimi virtuel\"%s\" nuk është lokal, burim i injoruar"
+msgid "trying to promote %s"
+msgstr "tentim në gradimin e %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Përgatitje..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - shpalosi pakotë lira.\n"
+msgid "in order to keep %s"
+msgstr "në urdhër për ta mbajturë %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
+msgid "in order to install %s"
+msgstr "në urdhër për instalim %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - mos tento gjetjen e ndonjë sintezë apo\n"
-"                   skedare hdlist.\n"
+msgid "due to conflicts with %s"
+msgstr "ka arritur gjatë konflikteve me %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - mos hulumto në këto pajisje për ta gjetur pakon.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopjimi i [%s] dështoi"
+msgid "unrequested"
+msgstr "i pa kërkuar"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Nënshkrim i pa pranueshëm (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Çelës invalid ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
-"  --clean        - zhduki të gjithë rpm e fshehta para gjdo operacioni.\n"
+msgid "Missing signature (%s)"
+msgstr "Mungon nënshkrimi (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"i pa mundur përdorimi i emrit \"%s\" për burim të pa emruar sepse ky emër "
-"është në përdorim e sipër"
+msgid "bad proxy declaration on command line\n"
+msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"burimi virtuel \"%s\" duhet të posedoj një burim hdlist apo sintezë, burim i "
-"injoruar"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -920,660 +822,716 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-"përdorim: urmpi.addmedia [options] <emri> <url> [me <shteg_relativë>]\n"
-"ku <url> është njëri nga\n"
-"       file://<shtegu>\n"
-"       ftp://<përdorues>:<parulla>@<ftuesi>/<shtegu> me <emër relativë të "
-"skedareshdlist>\n"
-"       ftp://<ftuesi>/<shtegu> me <emër relativë të skedares hdlist>\n"
-"       http://<ftuesi>/<shtegu> me <emër relativë të skedares hdlist>\n"
-"       removable://<shtegu>\n"
-"\n"
-"dhe [opcionet] janë nga\n"
+"  --auto         - zgjedhje automatike në njërën ndër pakot zgjedhëse.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopjimi i burimit hdlist (ose sintezës) të \"%s\"..."
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr ""
+"  --test        - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "...copying done"
-msgstr "...kopjimi i bërë"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "i pa mundur përdorimi i opcionit paralel \"%s\""
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr ""
+"  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
+
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"burimi \"%s\" përdore një listë skedaresh invalide:\n"
-" pasqyra nuk mund të azhurnohet, provoni ta përdorni metodën altenative"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "hyrja e pa mundur në burimin e parë instalues"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - model oratori.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "burimi virtuel duhet të jetë lokal"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "gabim gjatë regjistrimit të pakove lokale"
+msgid "unknown packages"
+msgstr "pako të pa njoftura"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - kyfizimi i shpëjtësisë së shkarkimit.\n"
+msgid "unknown package"
+msgstr "pako e pa njoftur"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
+msgid "removing package %s will break your system"
+msgstr "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "rikuperimi i burimit hdlist (ose sintezës) dështoi"
+msgid "Nothing to remove"
+msgstr "Mos zhduk asgjë"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "asnjë skedare rpm e gjetur nga [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Verifikimi i zhdukjes së pakove të radhitura"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "asgjë s'është shkruar në skedaren list \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
+msgid " (y/N) "
+msgstr " (p/J)"
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "llogaritja md5sum e burimit ekzistues në hdlist (ose sintezës)"
+msgid "removing %s"
+msgstr "zhdukja e %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - dalje komplete me pakon që duhet të zhduket.\n"
+msgid "Removing failed"
+msgstr "Zhdukja dështoi"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf versioni %s\n"
+"E Drejtë e Autorit (C) 2002 MandrakeSoft.\n"
+"Ky është një softver gratis i cili mund të shpërndahet ndër termet e GNU dhe "
+"GPL.\n"
+"\n"
+"përdorues:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "i pa mundur instalimi i pakos %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - përdori vetëm burimet e dhëna, të ndara me presje.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia        - mos i përdor vetëm burimet e dhëna, të ndara me "
+"presje.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - mundëson që përdoruesi në pytje të instaloj\n"
-"                   pakot pas i verifikuar mvarësit dhe integritetin e tyre.\n"
+"  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
+"me presje.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+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"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - model oratori.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
+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ë\n"
+"                    në linjën komanduese, nuk përputhet me modin "
+"interaktiv).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Çelës invalid ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - çfaqe etiketën group: grupi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - tento në gjetjen dhe përdorimin e skedares sintezë.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-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"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<shteg relativë i hdlist> mungon\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Verifikimi i zhdukjes së pakove të radhitura"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "i pa kërkuar"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "e pa mundur hyrja në skedaren rpm [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url        - çfaqe etiketën serial: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - çfaqe etiketën files: gjitha skedaret.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - çfaqe etiketën files: gjitha skedaret.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "i pa mundur leximi i skedares [%s] nga burimi \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - përdore mjedisin e veçantë (veçënarishtë një raport\n"
+"                   bug(i).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "krijimi i skedares sintezë për burimin \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - çfaqi informacionet përdoruse në formë lexuse humane.\n"
+"  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - përdore versionin e specifikuar, me marrëveshje\n"
-"                   pranohet nga versioni shpërndarës i treguar nga\n"
-"                   versioni i pakove instaluese mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from          - përdore url e specifikuar të pasqyreve me marrëvshje\n"
-"                    është %s\n"
+"  -a             - operues AND binar, saktësi nëse të dy shprehjet janë të "
+"sakta.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - operues OR binar, saktësi nëse njëra nga shprehjet është "
+"e saktë.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  -!             - njëjsi NOT, saktësi nëse shprehja është e pa vërtet.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
-
-#: ../urpm.pm:1
+#: ../urpmf:65
 #, c-format
-msgid "unmounting %s"
-msgstr "demontimi i %s"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (             - kllapë e majtë për ta hapur shprehjen e grupit.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:66
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  )              - right parenthesis to close group expression.\n"
 msgstr ""
-"asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% kompletuar, shpejtësia = %s"
+"  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "restarting urpmi"
+msgid ""
+"callback is :\n"
+"%s\n"
 msgstr ""
+"thirrja e mbrapme është :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "kontrollimi i skedares sintezë [%s]"
+msgid "using specific environment on %s\n"
+msgstr "përdorim specifik i mjedisit në %s\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "...copying failed"
-msgstr "...kopjimi dështoi"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpi versioni %s\n"
+"E drejtë e autorit (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ky është një softver gratis dhe mund të rishpërndahet ndër termet e GNU "
+"GPL.\n"
+"\n"
+"përdorim:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "e pa mundur hyrja në skedaren hdlist të \"%s\", burim i injoruar"
+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"
 
-#: ../urpmi:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - model i qetë.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
 
-#: ../urpmf:1
+#: ../urpmi:85
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - model oratori.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - mos pyet kurr për dez-instalimin e pakos, abortoje "
+"instalimin.\n"
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --sources      - jepi të gjitha burimet e pakove para se të shkarkohen "
-"(vetëm root).\n"
+"  --keep\t  - nëse ka mundësi i mbanë pakot prezente, refuzon pakot\n"
+"\t\t    e kërkuara me drejtim zhdukje.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --headers      - ekstrakto majat për pakot e radhitura nga baza e të "
-"dhënave\n"
-"                   të urpmi me dalje standarde (vetëm root).\n"
+"  --split-level  - ndrarje në trans-akcion nëse më shumë se një pako e "
+"dhënë\n"
+"                   instalohet apo uzhurnohet,\n"
+"                   me marrëveshje është %d.\n"
 
-#: ../urpme:1
+#: ../urpmi:91
 #, c-format
-msgid "unknown packages"
-msgstr "pako të pa njoftura"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
+"  --split-length - gjatësi e vogël e trans-akcionit, me marrëveshje është %"
+"d.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "zgjedhje të shumta burimesh: %s"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - shfrytëzoje hulumtimin e paqartë (njëjtë si -y).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
+"  --src          - pakoja me radhë është pako e burimit (njëjtë si -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "skedarja [%s] është në përdorim nga i njëjti burim \"%s\""
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalo vetëm burimet e pakove (jo binare).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:95
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "mos zhduk asgjë (përdore urpmi.addmedia për të shtuar një burim)\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - zhduki të gjithë rpm e fshehta para gjdo operacioni.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "e pa mundur gjetja e skedares listës të \"%s\", burim i injoruar"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - mbane rpm dhe mos e përdor në fshehje.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:98
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - shtype këtë lajmë ndihmues.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - mundëson që përdoruesi në pytje të instaloj\n"
+"                   pakot pas i verifikuar mvarësit e tyre.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "gjetja e përkrahjes në nyjet paralele: %s"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - mundëson që përdoruesi në pytje të instaloj\n"
+"                   pakot pas i verifikuar mvarësit dhe integritetin e tyre.\n"
 
-#: ../urpmf:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"thirrja e mbrapme është :\n"
-"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, 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"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"urpmf versioni %s\n"
-"E Drejtë e Autorit (C) 2002 MandrakeSoft.\n"
-"Ky është një softver gratis i cili mund të shpërndahet ndër termet e GNU dhe "
-"GPL.\n"
-"\n"
-"përdorues:\n"
+"  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - kyfizimi i shpëjtësisë së shkarkimit.\n"
+
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"  --quiet        - mos çfaqë emrat e etiketave (marrëveshje nëse asnjë "
-"etiketë s'është dhënë\n"
-"                    në linjën komanduese, nuk përputhet me modin "
-"interaktiv).\n"
+"  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
+"                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../urpmf:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - përdore proxy HTTP, numri i portës është i supozuar të\n"
+"                   jetë 1080 në marrëveshje (forma është <proxyhost[:port]"
+">).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
-"update or --paralle"
+"  --proxy-user   - specifiko përdoruesin dhe parullën për përdorimin e "
+"proxy\n"
+"                   me vërtetim (forma është <user:password>).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --arch         - përdore arqitekturën e specifikuar, me marrëveshje është\n"
-"                   arqitektura e pakove instaluese mandrake-release.\n"
+"  --bug          - dorëzoje një raport të bug(it) në repertorin e\n"
+"                   sugjeruar nga argumenti i dytë.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:119
 #, c-format
-msgid "Is this OK?"
-msgstr "Është kjo në rregull?"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
 
-#: ../urpmi:1
+#: ../urpmi:120
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - mos i prano skedaret doc.\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - zgjedheni sipërfaqen më të mirë në funksion të\n"
+"                   mjedisit: X apo në modë teksti.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:122
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --synthesis    - përdori skedaret e thëna sintezë në vend të bazës së të "
-"dhënave urpmi.\n"
+"  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
+"                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "kontrollimi i përkrahjes në skedaren paralele [%s]"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - përdori vetëm burimet e ndara me presje.\n"
 
-#: ../urpme:1
+#: ../urpmi:126
 #, c-format
-msgid "Nothing to remove"
-msgstr "Mos zhduk asgjë"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - mos i prano skedaret doc.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
+msgid "  -a             - select all matches on command line.\n"
+msgstr ""
+"  -a             - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "leximi i majës nga burimi \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
 
-#: ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - shtrirja e hetimeve në pakot e mvarura.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - mos hulumto në këto pajisje për ta gjetur pakon.\n"
 
-#: ../urpmi:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
-"  --bug          - dorëzoje një raport të bug(it) në repertorin e\n"
-"                   sugjeruar nga argumenti i dytë.\n"
+"  -y             - imponoje një hulumtim të paqartë (njëjtë si --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"burimi \"%s\" nuk ka kurrëfar difinicioni për lokalizimin e skedareve rpm "
-
-#: ../urpmf:1
-#, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
+"  -s             - pakoja tjetër është një pako burimi (njëjtë si --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "shkruarja në skedaren list është e pa mundur për \"%s\""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - model i qetë.\n"
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  emrat apo skedaret rpm në linjën komanduese do të instalohen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
+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:1
+#: ../urpmi:204
 #, c-format
-msgid "Copying failed"
-msgstr "Kopjimi dështoi"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:212
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - përfitim i forcuar në skedaret hdlist.\n"
+msgid "Do nothing"
+msgstr "Asnjë veprim"
 
-#: ../urpmq:1
+#: ../urpmi:213
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
+msgid "Save file"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:225
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  -s             - pakoja tjetër është një pako burimi (njëjtë si --src).\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "installing %s"
-msgstr "instalimi i %s"
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Instalimi dështio"
 
-#: ../urpm.pm:1
+#: ../urpmi:239
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lexim i skedareve rpm nga [%s]"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopjimi i skedares përshkruese të \"%s\"..."
+msgid "Unable to create directory [%s] for bug report"
+msgstr "I pa mundur krijimi i repertorit [%s] për raport të bug(it)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - zgjedhje automatike në njërën ndër pakot zgjedhëse.\n"
+msgid "Copying failed"
+msgstr "Kopjimi dështoi"
 
-#: ../urpme:1
+#: ../urpmi:260
 #, c-format
-msgid "Removing failed"
-msgstr "Zhdukja dështoi"
+msgid "Only superuser is allowed to install packages"
+msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:396
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
-"  --virtual      - krijo një burim vituel i cili përdoret gjithnji për "
-"azhurnim,\n"
-"                   vetëm skedarja:// protokoli është i lejuar.\n"
+msgid "One of the following packages is needed:"
+msgstr "Një nga pakot e radhitura nevojitet:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "package %s is not found."
-msgstr "pakoja %s nuk është prezente"
+msgid "What is your choice? (1-%d) "
+msgstr "Cila është zgedhja e juaj? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "zhdukja e burimit \"%s\""
+msgid "Package installation..."
+msgstr "Instalimi i pakos..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
+msgid "Initializing..."
+msgstr "Inicializimi..."
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "Cancel"
-msgstr "Anulo"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Disa nga pakot e kërkuara nuk mund të instalohen:\n"
+"%s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - pakoja me radhë është pako e burimit (njëjtë si -s).\n"
+msgid "do you agree ?"
+msgstr "a pajtoheni ?"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --env          - përdore mjedisin e veçantë (veçënarishtë një raport\n"
-"                   bug(i).\n"
+"Instalimin nuk mund të vazhdoj më tutje, sepse pakot a radhitura duhet\n"
+"të zhduken që të tjerat të azhurnohen:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
-"me presje.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "hyrje e pa mundur në burimin \"%s\""
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "i pa mundur krijimi i burimit \"%s\"\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
+"Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
+"%s"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
+"Për ti përmbushur mvarësit, pakot e radhitura duhet të instalohen (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1582,380 +1540,430 @@ msgstr ""
 "Ju duhet të jeni administrator  për t'instaluar mvarësit e radhitura:\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "e pa mundur hyrja në skedaren e listës të \"%s\", burim i injoruar"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
+msgid "Press Enter when ready..."
+msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "Shkarkimi i pakos `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "kontrollimi i skedares hdlist [%s]"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejtësia = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopjimi i skedares hdlist..."
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% kompletuar, shpejtësia = %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "shkruarja e skedares për listën e burimit \"%s\""
+msgid "The following packages have bad signatures"
+msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"burimi virtuel \"%s\" duhet të posedoj një url të qartë, burim i injoruar"
+msgid "Do you want to continue installation ?"
+msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
 
-#: ../urpmf:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Instalimi dështoi, disa skedare mungojnë:\n"
+"%s\n"
+"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
 
-#: ../urpmi:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "Do nothing"
-msgstr "Asnjë veprim"
+msgid "Installation failed"
+msgstr "Instalimi dështio"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "përdorimi i burimit të lidhur për modë paralel: %s"
+msgid "distributing %s"
+msgstr "shpërndarje e %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "mounting %s"
-msgstr "montimi i %s"
+msgid "installing %s"
+msgstr "instalimi i %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"e pa mundur kujdesja e burimit \"%s\" lista e skedares përdoret nga një "
-"burim tjetër"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instalimi i pakove `%s' (%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:712
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
 
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr ""
-"  --curl         - pëdore curl për rikuperimin e skedareve në distancë.\n"
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
 
-#: ../urpmi:1
+#: ../urpmi:772
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% nga %s kompletuar, ETA = %s, shpejtësia = %s"
+msgid "%d installation transactions failed"
+msgstr "Instalimi i transmetimit të %d dështio"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
+msgid "Installation is possible"
+msgstr "Instalimi është i mundur"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
+msgid "Everything already installed"
+msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+msgid "restarting urpmi"
 msgstr ""
-"  --no-uninstall - mos pyet kurr për dez-instalimin e pakos, abortoje "
-"instalimin.\n"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"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"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
 "\n"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq versioni %s\n"
-"E Drejtë e Autorit (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ky është një softver gratis i cili mund të shpërndahet ndër termet e GNU "
-"GPL.\n"
+"përdorim: urmpi.addmedia [options] <emri> <url> [me <shteg_relativë>]\n"
+"ku <url> është njëri nga\n"
+"       file://<shtegu>\n"
+"       ftp://<përdorues>:<parulla>@<ftuesi>/<shtegu> me <emër relativë të "
+"skedareshdlist>\n"
+"       ftp://<ftuesi>/<shtegu> me <emër relativë të skedares hdlist>\n"
+"       http://<ftuesi>/<shtegu> me <emër relativë të skedares hdlist>\n"
+"       removable://<shtegu>\n"
 "\n"
-"përdorues:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
+"dhe [opcionet] janë nga\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - çfaqi grupet njashtu dhe emrat.\n"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - krijo një burim azhurnimi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "burimi \"%s\" nuk është i zgjedhur"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - tento në gjetjen dhe përdorimin e skedares sintezë.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
+"  --probe-hdlist - tento në gjetjen dhe përdorimin e skedares hdlist.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "përdorim specifik i mjedisit në %s\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - mos tento gjetjen e ndonjë sintezë apo\n"
+"                   skedare hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "e pa mundur gjetja e skedarës hdlist të \"%s\", burim i injoruar"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - krijo automatikisht të gjitha burimet nga një\n"
+"                   burim instalues.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"  --split-length - gjatësi e vogël e trans-akcionit, me marrëveshje është %"
-"d.\n"
+"  --distrib-XXX  - krijo automatikisht një burim për pjesën XXX në\n"
+"                   shpërndarjen, XXX e cila mund të jetë kryesore,\n"
+"                   kontribuese, azhrunuese apo çfarë do çoftë mbasi\n"
+"                   të jetë konfiguruar ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (             - kllapë e majtë për ta hapur shprehjen e grupit.\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from          - përdore url e specifikuar të pasqyreve me marrëvshje\n"
+"                    është %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "shumë pika montuese për burimin tërheqës \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - përdore versionin e specifikuar, me marrëveshje\n"
+"                   pranohet nga versioni shpërndarës i treguar nga\n"
+"                   versioni i pakove instaluese mandrake-release.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  -a             - operues AND binar, saktësi nëse të dy shprehjet janë të "
-"sakta.\n"
+"  --arch         - përdore arqitekturën e specifikuar, me marrëveshje është\n"
+"                   arqitektura e pakove instaluese mandrake-release.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"blokon hyrjen në burimin \"%s\",\n"
-"kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
-"burim."
+"  --virtual      - krijo një burim vituel i cili përdoret gjithnji për "
+"azhurnim,\n"
+"                   vetëm skedarja:// protokoli është i lejuar.\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - çfaqe etiketën group: grupi.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr ""
-"  --media        - përdori vetëm burimet e dhëna, të ndara me presje.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - pastrim i majave në repertort e fshehtë.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to create transaction"
-msgstr "i pa mundur krijimi i një akcioni transmetues"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - përfitim i forcuar në skedaret hdlist.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "nuk mund të shtoj azhurnime në shpërndarësinë cooker\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
-msgstr ""
+msgid "retrieving mirrors at %s ..."
+msgstr "rikuperimi i pasqyreve në %s..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "distributing %s"
-msgstr "shpërndarje e %s"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "Installation failed"
-msgstr "Instalimi dështio"
+msgid "unable to update medium \"%s\"\n"
+msgstr "i pa mundur azhurnimi i burimit \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "write config file [%s]"
-msgstr "shkruaja e skedares konfiguruese [%s]"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<shteg relativë i hdlist> mungon\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - zgjidhi të gjitha burimet jo levizëse.\n"
+msgid "`with' missing for network media\n"
+msgstr "direktivë `me' mungon burimi i rrjetit\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "i pa mundur krijimi i burimit \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
-"                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
+"përdorim:urmpi.removemedia [-a] <emri> ...\n"
+"ku <emri> është një burim për zhdukje.\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - zgjidhi të gjitha burimet.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - krijo një burim azhurnimi.\n"
-
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-media   - shpalosi burimet e lira.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"opcione të pa njoftura '%s'\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr ""
-"  -y             - imponoje një hulumtim të paqartë (njëjtë si --fuzzy).\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "mos zhduk asgjë (përdore urpmi.addmedia për të shtuar një burim)\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"hyrja zhdukëse mungon\n"
+"(një nga %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "përshkrimi \"%s\" i pa pranueshëm për skedaret hdlists"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"përdorim:urmpi.update [option] <emri> ...\n"
+"ku <emri> është një emrim i burimit azhurnues.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "removing %s"
-msgstr "zhdukja e %s"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - azhurno vetëm burimet azhurnuese.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:40
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
-"  --distrib-XXX  - krijo automatikisht një burim për pjesën XXX në\n"
-"                   shpërndarjen, XXX e cila mund të jetë kryesore,\n"
-"                   kontribuese, azhrunuese apo çfarë do çoftë mbasi\n"
-"                   të jetë konfiguruar ;-)\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:41
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - zgjidhi të gjitha burimet jo levizëse.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:63
 #, c-format
-msgid "in order to keep %s"
-msgstr "në urdhër për ta mbajturë %s"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:75
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "ka arritur gjatë mosmarrëveshjes %s"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"hyrja për azhurnim mungon\n"
+"(një nga %s)\n"
 
-#: ../_irpm:1
-#, c-format
+#: ../urpmq:38
+#, fuzzy, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"Instalim automatikë i pakove...\n"
-"Ju keni kërkuar instalimin e pakove %s\n"
+"urpmf versioni %s\n"
+"E Drejtë e Autorit (C) 2002 MandrakeSoft.\n"
+"Ky është një softver gratis i cili mund të shpërndahet ndër termet e GNU dhe "
+"GPL.\n"
+"\n"
+"përdorues:\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:53
 #, c-format
-msgid "urpmi database locked"
-msgstr "baza e të dhënave urpmi është e mbyllur"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpmi:1
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - shpalosi burimet e lira.\n"
+
+#: ../urpmq:55
 #, fuzzy, c-format
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-media   - shpalosi burimet e lira.\n"
+
+#: ../urpmq:56
+#, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
-"                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "verifimi i skedares pubkey të \"%s\"..."
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - shpalosi nyjet kur ato përdoren në --parallel.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:58
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
+"  --list-aliass   - shpalosi burimet e lira paralele me pseudonime të "
+"njëjta.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:60
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "marrje e mjetit tërheqës si \"%s\""
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - ekstrakto majat për pakot e radhitura nga baza e të "
+"dhënave\n"
+"                   të urpmi me dalje standarde (vetëm root).\n"
 
-#: ../urpmi:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
+"  --sources      - jepi të gjitha burimet e pakove para se të shkarkohen "
+"(vetëm root).\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:65
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - shfrytëzoje hulumtimin e paqartë (njëjtë si -y).\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - çfaqi të gjitha etiketat.\n"
+
+#: ../urpmq:77
+#, c-format
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - shtrirja e hetimeve në pakot e mvarura.\n"
+
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -1964,42 +1972,80 @@ msgstr ""
 "  -u             - zhduke pakon nëse një version më i ri është veçse i "
 "instaluar.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:80
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - dalje komplete me pakon që duhet të zhduket.\n"
+
+#: ../urpmq:82
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"  --probe-hdlist - tento në gjetjen dhe përdorimin e skedares hdlist.\n"
+"  -i             - çfaqi informacionet përdoruse në formë lexuse humane.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "due to missing %s"
-msgstr "ka arritur nga mungesa %s"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - çfaqi grupet njashtu dhe emrat.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - çfaqe versionin me hollësi, njashtu dhe emrin.\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - shpalosi pakotë lira.\n"
+
+#: ../urpmq:90
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"përdorim:urmpi.update [option] <emri> ...\n"
-"ku <emri> është një emrim i burimit azhurnues.\n"
+"  emrat apo skedaret rpm të marra në linjën komanduese janë nën hetim.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "tentim në kalimin e një burimit ekzistues \"%s\", ndërprerje"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --test        - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
+
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "asnjë listë komplete për burim"
+
+#: ../urpmq:398
+#, c-format
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Një nga pakot e radhitura duhet të instalohet %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq versioni %s\n"
+#~ "E Drejtë e Autorit (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ky është një softver gratis i cili mund të shpërndahet ndër termet e GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "përdorues:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Program i pa njoftur për riatdhezimin e faqeve web `%s' !!!\n"
@@ -2175,9 +2221,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "tento urpmf --help për me shumë opcione"
 
-#~ msgid "no full media list was found"
-#~ msgstr "asnjë listë komplete për burim"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "kopjim i listës së burimit të \"%s\"..."
 
diff --git a/po/sr.po b/po/sr.po
index a35f8241..e67b26c9 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -41,871 +41,778 @@ msgstr "ДдDdYy"
 msgid "Nn"
 msgstr "НнNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "Инсталирам %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - аутоматски направи све медије са инсталационог\n"
-"                    медија.\n"
+"Аутоматска инсталациjа пакетa...\n"
+"Захтевали сте инсталациjу пакета %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "не могу да отворим rpmdb"
+msgid "Is this OK?"
+msgstr "Да ли је овако добро?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - приказује овај екран о помоћи.\n"
+msgid "Ok"
+msgstr "У реду"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Један од следећих пакета је потребан да би инсталирали %s:"
+msgid "Cancel"
+msgstr "Одустани"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "уклањам пакет %s"
+msgid " (Y/n) "
+msgstr " (Д/н) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: команда ниjе пронaђенa\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Не могу да користим паралелни мод са use-distrib модом"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "све је већ инсталирано"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - приказује овај екран о помоћи.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - приказује таг групе: група.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - чисти директоријум са кешом надглавља.\n"
+msgid "unknown protocol defined for %s"
+msgstr "непознати протокол дефинисан за %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "користим процес %d за извршење трансакције"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
+msgid "unable to handle protocol: %s"
+msgstr "не могу да подржим протокол: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Шта желите? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "синтаксна грешка у конфигурационом фајлу у реду %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "пронађено %d хедера у кеш меморији"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"медиј \"%s\" покушава да користи hdlist која је већ коришћена, медиј ће бити "
+"игнорисан"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "постоји више пакета са истим именом rpm датотеке \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"медиј \"%s\" покушава да користи листу која је већ употребљена, медиј је "
+"игнорисан"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - одређује корисника и лозинку који се користе за proxy\n"
-"                   аутентификацију (формат је <user:password>).\n"
+"не могу да користим медиј \"%s\" пошто се датотеку листе користи други медиј"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "сада се проверавају међузависности пакета\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"не могу да користим име \"%s\" као име за неименовани медијум зато што је то "
+"име већ у употреби"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "добављам rpm фајл [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "не могу да узмем медиј \"%s\" у обзир пошто не постоји листа [%s] "
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases         - приказује листу паралелних алијаса.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "не могу да одредим медиј за овај hdlist фајл [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...повраћај неуспео: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "не могу да приступим hdlist фајлу за \"%s\", медиј је игнорисан"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "не могу да истражим датотеку листе за \"%s\", медиј је игнорисан"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "не могу да приступим фајлу листе за \"%s\", mедиј игнорисан"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - бинарни OR оператор, истинит уколико је један израз "
-"тачан.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "покушавам да премостим постојећи медиј \"%s\", избегавам"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Инсталација пакета..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"виртуални медиј \"%s\" не би требао да има дефинисиану  hdlist или листу "
+"фајлова, игноришем медиј"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "погрешно име rpm датотеке [%s]"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "виртулени медиј \"%s\" би требао да има чист url, игноришем медиј"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "лоша proxyдекларација у командној линији\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "не могу да пронађем hdlist датотеку за \"%s\", медијум је игнорисан"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d инстлациона трансакција није успела"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "немогу да пронађем датотеку листе за \"%s\", медијум је игнорисан"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"не могу да приступим првом инсталационом медију (није пронађен Mandrake/base/"
-"hdlists фајл)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "некохерентна датотека листе за \"%s\", медиј је игнорисан"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Погрешан избор, пробајте поново\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "не могу да истражим датотеку листе за \"%s\", медиј је игнорисан"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "превише тачака монтирања за преносни медиј \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
+msgid "taking removable device as \"%s\""
+msgstr "узимам преносни уређај као \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следећи пакети садрже %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Инсталациjа није успела"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "користећи различит преносни уређај или [%s] за \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - користи X интерфејс.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "не могу да добавим путању за преносни медиј \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Потребан(и) су следећи пакет(и):"
+msgid "unable to write config file [%s]"
+msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
+msgid "write config file [%s]"
+msgstr "уписујем у конфигурациону датотеку [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - бира најбољи интерфејс сходно окружењу:\n"
-"                   X или текстуални мод.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Не могу да користим паралелни мод са use-distrib модом"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Скидам пакет `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Шта се може учинити са бинарним rpm пакетима када се користи опција --"
-"install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "испитујем паралелни држач у фајлу [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - аутоматска избор пакета да би се ажурирао систем.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "пронађен паралелни држач ѕа нодове: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "Нема пакета са именом %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "користим додељени медиј за паралелни мод: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - бира сва поклапања у командној линији.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "не могу да користим паралелну опцију \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Инсталација неуспела, недостају неки фајлови.\n"
-"%s\n"
-"Можда желите да ажурирате вашу urpmi базу података."
+"--synthesis се не може користити са --media, --excludemedia, --sortmedia, --"
+"update или --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"употребa: urpmi.removemedia [-a] <имe> ...\n"
-"где je <имe> име медија за уклaњaњe.\n"
+msgid "examining synthesis file [%s]"
+msgstr "испитујем synthesis фајл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Инсталација се не може наставити зато што следећи пакети\n"
-"морају бити уклоњени да би остали могли да се ажурирају:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "испитујем  hdlist фајл [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`са недостатком за мрежни ftp медиj\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "виртуални медиј \"%s\" није локални, игноришем медиј"
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "проблем са читањем hdlist или synthesis фајла за медиј \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "непознати пакет"
+msgid "performing second pass to compute dependencies\n"
+msgstr "сада се проверавају међузависности пакета\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Инсталација је могућа"
+msgid "skipping package %s"
+msgstr "прескачем пакет %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Ради задовољења зависности, следећи пакети ће бити инсталирани (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "ће инсталирати уместо ажурирати пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "не могу да узмем медиј \"%s\" у обзир пошто не постоји листа [%s] "
+msgid "unable to open rpmdb"
+msgstr "не могу да отворим rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (д/Н) "
+msgid "medium \"%s\" already exists"
+msgstr "медиј \"%s\" већ постоји"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "не могу да додам надоградње cooker дистрибуцији\n"
+msgid "virtual medium need to be local"
+msgstr "виртуални медиј мора да буде локални"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose режим.\n"
+msgid "added medium %s"
+msgstr "додани медиј %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "покрећем..."
+msgid "unable to access first installation medium"
+msgstr "не могу да приступим првом инсталационом медију"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - приказује листу пакета.\n"
+msgid "copying hdlists file..."
+msgstr "копирам hdlist фајл..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - приказује све тагове.\n"
+msgid "...copying failed"
+msgstr "...копирање није успело"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
+msgid "...copying done"
+msgstr "...копирање завршено"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"виртуални медиј \"%s\" не би требао да има дефинисиану  hdlist или листу "
-"фајлова, игноришем медиј"
+"не могу да приступим првом инсталационом медију (није пронађен Mandrake/base/"
+"hdlists фајл)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "прорачунавам md5sum копиране  source hdlist (или  synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "добављам hdlists фајл..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - искључује путању раздвојену зарезом.\n"
+msgid "...retrieving done"
+msgstr "... добављање завршено"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Притисните enter када будете спремни..."
+msgid "...retrieving failed: %s"
+msgstr "...повраћај неуспео: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"непознате опције '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "неправилан hdlist опис \"%s\" и hdlists фајлу"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - издели у мале трансакције уколико ће бити инсталирано\n"
-"                   више пакета од датог броја,\n"
-"                   default је %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "покушавам да селектујем непостојећи медиј \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "проблем са читањем hdlist или synthesis фајла за медиј \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "покушавам да селектујем вишеструки медиј: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - користи wget за добављање удаљених фајлова.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "уклањам медиј \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p            - дозвољава претраживање по пружању ради налажења пакета.\n"
+"не могу да приступим медију \"%s\",\n"
+"ово се може десити уколико сте ручно монтирали директоријум приликом "
+"креирања медија."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes         - приказује листу чворова при коришћењу опције --"
-"parallel.\n"
+"виртуални медиј \"%s\" би требао да има исправан source hdlist или "
+"synthesis, игноришем медиј"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "креирам hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "копирам описни фајл за \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - задржава постојеће пакет уколико је могуће, одбацује "
-"захтевани пакет\n"
-"                   који води уклањању.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "прорачунавам md5sum постојеће source hdlist (или synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "испитујем MD5SUM фајл"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: команда ниjе пронaђенa\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to register rpm file"
-msgstr "не могу да региструјем  rpm фајл"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "копирање изворне hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - дозвољава упит за корисника да ли да инсталира пакете "
-"без\n"
-"                   провере међузависности пакета.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "не могу да подржим протокол: %s"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "прорачунавам md5sum копиране  source hdlist (или  synthesis)"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "добављам hdlists фајл..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "копирање [%s] неуспело"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "додани медиј %s"
+msgid "reading rpm files from [%s]"
+msgstr "читам rpm фајлове са [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - чува rpm који нису коришћени у кешу.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "не могу да прочитам rpm фајлове са [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"креирана трансакција за инсталирање на  %s (уклони=%d, инсталирај=%d, "
-"ажурирај=%d)"
+msgid "no rpm files found from [%s]"
+msgstr "нема rpm датотека на [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum не одговара"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "синтаксна грешка у конфигурационом фајлу у реду %s"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "пронађена тестирана hdlist (или synthesis) као %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  имена или rpm фајлови дати у командној линији ће бити инсталирани.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "прорачунавам md5sum of retrieved source hdlist (or synthesis)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - користи специфицирани HTTP proxy, прој порта се "
-"претпоставља\n"
-"                   да је 1080 по default-у (формат је <proxyhost[:port]>).\n"
+msgid "md5sum mismatch"
+msgstr "md5sum не одговара"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to install %s"
-msgstr "да би инсталирао %s"
+#: ../urpm.pm:1483
+#, fuzzy, c-format
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "повраћај изворне hdlist (или synthesis) неуспео"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "премештени %s уноси у depslist"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "није пронађена hdlist датотека за медиј \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "фајл [%s] је већ корисштен за исти медиј \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "не могу да направим директоријум [%s] за извештај о грешци"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "не могу да парсирам hdlist датотеку за \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ће инсталирати уместо ажурирати пакет %s"
+msgid "unable to write list file of \"%s\""
+msgstr "не могу да упишем датотеку листе за \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "добављам мироре на %s ..."
+msgid "writing list file for medium \"%s\""
+msgstr "уписујем листу фајлова за медиј \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - приказује таг url: url.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "нема шта да се упише у датотеку листе за \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "непознати протокол дефинисан за %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "испитукем фајл са јавним кључем за \"%s\"..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - приказује верзију укључујући и име.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "..импортовани кључ%s од јавног кључа за \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "не могу да импортујем јавни кључ за \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "медиј \"%s\" већ постоји"
+msgid "reading headers from medium \"%s\""
+msgstr "читам хедере са медија \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "Инсталирам %s\n"
+msgid "building hdlist [%s]"
+msgstr "креирам hdlist [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"недостаjе унос за aжурирaње\n"
-"(jедан од %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr "покушавам да прикажем %s"
+msgid "found %d headers in cache"
+msgstr "пронађено %d хедера у кеш меморији"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "не могу да уклоним пакет %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "уклањам %d obsolete hхедере у кеш меморији"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
+msgid "mounting %s"
+msgstr "монтирам %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"недостаjе унос за брисaњe\n"
-"(jедан од %s)\n"
+msgid "unmounting %s"
+msgstr "демонтирам %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - селектује све медије.\n"
+msgid "relocated %s entries in depslist"
+msgstr "премештени %s уноси у depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Недостаје потпис (%s)"
+msgid "no entries relocated in depslist"
+msgstr "нема премештених уноса у depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "не могу да прочитам rpm фајлове са [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "погрешно име rpm датотеке [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - дистрибуирани urpmi преко машина са надимком.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "добављам rpm фајл [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "не могу да приступим rpm датотеци [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ажурирај само медијум за ажурирање.\n"
+msgid "unable to register rpm file"
+msgstr "не могу да региструјем  rpm фајл"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (Д/н) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - приказује таг групе: група.\n"
+msgid "error registering local packages"
+msgstr "грешка при регистровању локалних пакета"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"медиј \"%s\" покушава да користи листу која је већ употребљена, медиј је "
-"игнорисан"
+msgid "no package named %s"
+msgstr "Нема пакета са именом %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "погрешан унос: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Следећи пакети садрже %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "уклањање пакета %s ће нарушити Ваш систем"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "постоји више пакета са истим именом rpm датотеке \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media         - приказује листу медија.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "не могу да исправно парсирам [%s] за вредност \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Неки изабрани пакети се не могу инсталирати:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Инсталирам пакет `%s' (%s/%s)..."
+"медиј \"%s\" користи фајл са погрешном листом:\n"
+"  мирор вероватно није ажуриран, покушавам да користим алтернативни метод"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "нема премештених уноса у depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "медиј \"%s\" не дефинише ни једну локацију за rpm фајлове"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - инсталира само пакете са изворним кодом.\n"
+msgid "package %s is not found."
+msgstr "пакет %s није пронађен."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - користи curl за добављање удаљених фајлова.\n"
+msgid "urpmi database locked"
+msgstr "urpmi база података закључана"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - укључује перл код директно као perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "медиј \"%s\" није изабран"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "да ли се слажете?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "не могу да прочитам rpm датотеку [%s] са медија \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "некохерентна датотека листе за \"%s\", медиј је игнорисан"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "... добављање завршено"
+msgid "unable to access medium \"%s\""
+msgstr "не могу да приступим медиjу \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "додајем пакет %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "погрешан унос: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "прескачем пакет %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Неисправан потпис (%s)"
+msgid "Preparing..."
+msgstr "Припремам..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  имена или rpm фајлови који су дати у командној линији се проверавају.\n"
+msgid "using process %d for executing transaction"
+msgstr "користим процес %d за извршење трансакције"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi верзија %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ово је бесплатан софтвер и може бити слободно редистрибуиран под условима \n"
-"GNU и GPL. употреба:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "не могу да исправно парсирам [%s] за вредност \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
+"креирана трансакција за инсталирање на  %s (уклони=%d, инсталирај=%d, "
+"ажурирај=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "не могу да одредим медиј за овај hdlist фајл [%s]"
+msgid "unable to create transaction"
+msgstr "не могу да креирам трансакцију"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "не могу да парсирам hdlist датотеку за \"%s\""
+msgid "removing package %s"
+msgstr "уклањам пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"медиј \"%s\" покушава да користи hdlist која је већ коришћена, медиј ће бити "
-"игнорисан"
+msgid "unable to remove package %s"
+msgstr "не могу да уклоним пакет %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "због конфликта са %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "додајем пакет %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "уклањам %d obsolete hхедере у кеш меморији"
+msgid "unable to install package %s"
+msgstr "не могу да инсталирам пакет %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "не могу да aжурирам медиj \"%s\"\n"
+msgid "due to missing %s"
+msgstr "због не постојања %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Инсталиација без провере зависности (дa/Нe)? "
+msgid "due to unsatisfied %s"
+msgstr "због не задовољеног %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "виртуални медиј \"%s\" није локални, игноришем медиј"
+msgid "trying to promote %s"
+msgstr "покушавам да прикажем %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Припремам..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
+msgid "in order to keep %s"
+msgstr "да бих задржао %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "користећи различит преносни уређај или [%s] за \"%s\""
+msgid "in order to install %s"
+msgstr "да би инсталирао %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - не покушава да пронађе било који synthesis или\n"
-"                   hdlist фајл.\n"
+msgid "due to conflicts with %s"
+msgstr "због конфликта са %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - не претражује доступне ради налажења пакета.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "копирање [%s] неуспело"
+msgid "unrequested"
+msgstr "незахтевано"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - подешава urpmi у лету са distrib стабла.\n"
-"                   Ова опција дозвољава испитивање дистрибуције.\n"
+msgid "Invalid signature (%s)"
+msgstr "Неисправан потпис (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Погрешан ID кључа(%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - уклања rpm из кеша пре било чега другог.\n"
+msgid "Missing signature (%s)"
+msgstr "Недостаје потпис (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"не могу да користим име \"%s\" као име за неименовани медијум зато што је то "
-"име већ у употреби"
+msgid "bad proxy declaration on command line\n"
+msgstr "лоша proxyдекларација у командној линији\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"виртуални медиј \"%s\" би требао да има исправан source hdlist или "
-"synthesis, игноришем медиј"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Погрешан избор, пробајте поново\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -922,1073 +829,1212 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - приказује овај екран о помоћи.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - аутоматски селектује пакете од понуђеног.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"употребa: urpmi.addmedia [опције] <име> <url> [with <релативном_путања>]\n"
-"где je <url> jедан од\n"
-"       file://<путaњa>\n"
-"       ftp://<login>:<лозинкa>@<host>/<путaњa> with <релативно име датотекe "
-"сahdlist>\n"
-"       ftp://<host>/<путaњa> with <релативно име датотеке сa hdlist>\n"
-"       http://<host>/<путaњa> with <релативно име датотеке сa hdlist>\n"
-"\n"
-"       removable://<путaњa>\n"
+"  --test         - проверава да ли се може извести исправна инсталација.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "копирање изворне hdlist (или synthesis) за \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - приморава на инвокацију чак и ако неки пакети не "
+"постоје.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...копирање завршено"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - дистрибуирани urpmi преко машина са надимком.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "не могу да користим паралелну опцију \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"медиј \"%s\" користи фајл са погрешном листом:\n"
-"  мирор вероватно није ажуриран, покушавам да користим алтернативни метод"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "не могу да приступим првом инсталационом медију"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "виртуални медиј мора да буде локални"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - изабери све пакете који одговарају изразу.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "грешка при регистровању локалних пакета"
+msgid "unknown packages"
+msgstr "непознати пакети"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - лимитира брзину download-а.\n"
+msgid "unknown package"
+msgstr "непознати пакет"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "пронађена тестирана hdlist (или synthesis) као %s"
+msgid "removing package %s will break your system"
+msgstr "уклањање пакета %s ће нарушити Ваш систем"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "повраћај изворне hdlist (или synthesis) неуспео"
+#: ../urpme:95
+#, c-format
+msgid "Nothing to remove"
+msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "нема rpm датотека на [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Проверавам како бих уклонио следеће пакете"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "нема шта да се упише у датотеку листе за \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Следећи пакети имају неисправне потписе"
+msgid " (y/N) "
+msgstr " (д/Н) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "прорачунавам md5sum постојеће source hdlist (или synthesis)"
+msgid "removing %s"
+msgstr "уклањам %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - потпун излаз са пакетом који треба да се уклони.\n"
+msgid "Removing failed"
+msgstr "Уклањање није успело"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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) 2002 MandrakeSoft.\n"
+"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
+"\n"
+"употреба:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "не могу да инсталирам пакет %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - користи само update медиј.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - користи само дати медиј, одвојен зарезом.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - дозовољава упит корисника да ли жели да инсталира пакете "
-"без\n"
-"                   провере међузависности и интегритета.\n"
+"  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - користи дати synthesis уместо urpmi-јеве базе.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose режим.\n"
+
+#: ../urpmf:39
+#, c-format
+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"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - не приказује идентичне линије.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "не могу да извршим упис у конфигурациону датотеку [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - приказује све тагове.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - изабери све пакете који одговарају изразу.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - приказује таг групе: група.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Погрешан ID кључа(%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - приморава на инвокацију чак и ако неки пакети не "
-"постоје.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "не могу да добавим путању за преносни медиј \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - покушава да пронађе и користи synthesis фајл.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - приказује таг описа: опис.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - приморава на ажурирање gpg кључа.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - приказује таг packager: packager.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "недостаjе <релативна путaња hdlist>\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Проверавам како бих уклонио следеће пакете"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - приказује таг url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "незахтевано"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "не могу да приступим rpm датотеци [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - приказује таг фајлове: све фајлове.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Не могу да парсирам \"%s\" у фајл [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Да ли желите да наставите конфигурацију ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "не могу да прочитам rpm датотеку [%s] са медија \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - користи специфично окружење (типично извештај о грешци).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - приказје корисне информације у, за људе читљивном "
-"облику.\n"
+"  -f             - приказује верзију, издање и архитектуру, укључујући и "
+"име.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - користи дату верзију дистрибуције, default је узета\n"
-"                   из верзије дистрибуције која је наведена у\n"
-"                   деинсталираном mandrake-release пакету.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - укључује перл код директно као perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --form        - користи дату url адресу за лист мирора, подразумевано је\n"
-"                    %s\n"
+"  -a             - инарни AND oоператор, истинит уколико су оба израза "
+"истинита.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - бинарни OR оператор, истинит уколико је један израз "
+"тачан.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - бинарни NOT, истинит уколико је израз погрешан.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - лева заграда за отоврање групе израза.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - десна заграда за затварање групе израза.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Директоријум  [%s] већ постоји, изаберите други директоријум за пријављивање "
-"багова или га избришите"
+"повратни је :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "демонтирам %s"
+msgid "using specific environment on %s\n"
+msgstr "користим дато окружење на %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "нема ничега зa aжурирaњe (користи urpmi.addmedia за додавaње медиja)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% завршено, брзина = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi верзија %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ово је бесплатан софтвер и може бити слободно редистрибуиран под условима \n"
+"GNU и GPL. употреба:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "рестартујем urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "испитујем synthesis фајл [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - аутоматска избор пакета да би се ажурирао систем.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Присилна инсталација (--force)? (дa/Нe) ?"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - никада не тражи деинсталацију пакета, обустави "
+"инсталацију.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...копирање није успело"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - задржава постојеће пакет уколико је могуће, одбацује "
+"захтевани пакет\n"
+"                   који води уклањању.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "не могу да приступим hdlist фајлу за \"%s\", медиј је игнорисан"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - издели у мале трансакције уколико ће бити инсталирано\n"
+"                   више пакета од датог броја,\n"
+"                   default је %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - тихи режим (мало порука).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - мала дужина трансакције, основна поставка је %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose режим.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - узрокује fuzzy претрагу (исто као -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - приказује све изворне пакете пре download-а (само root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - следећи пакет је изворни пакет (исто као и  -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - екстрактује хедере за пакете приказане из urpmi db на\n"
-"                   stdout (само root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - инсталира само пакете са изворним кодом.\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "непознати пакети"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - уклања rpm из кеша пре било чега другог.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "покушавам да селектујем вишеструки медиј: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - чува rpm који нису коришћени у кешу.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - приказује верзију, издање и архитектуру, укључујући и "
-"име.\n"
+"  --allow-nodeps - дозвољава упит за корисника да ли да инсталира пакете "
+"без\n"
+"                   провере међузависности пакета.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "фајл [%s] је већ корисштен за исти медиј \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - дозовољава упит корисника да ли жели да инсталира пакете "
+"без\n"
+"                   провере међузависности и интегритета.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "нема ничега зa брисaњe (користи urpmi.addmedia за додавaње медиja)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "немогу да пронађем датотеку листе за \"%s\", медијум је игнорисан"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - користи wget за добављање удаљених фајлова.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - приказује овај екран о помоћи.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - користи curl за добављање удаљених фајлова.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "пронађен паралелни држач ѕа нодове: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - лимитира брзину download-а.\n"
 
-#: ../urpmf:1
-#, c-format
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"повратни је :\n"
-"%s\n"
+"  --verify-rpm   - верификује rpm потписе пре инсталације.\n"
+"                   (--no-verify-rpm не веригикује, стандардна је "
+"верификација).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - претрага уназад за оним што захтева пакет.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - користи специфицирани HTTP proxy, прој порта се "
+"претпоставља\n"
+"                   да је 1080 по default-у (формат је <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmq верзија %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
-"\n"
-"употреба:\n"
+"  --proxy-user   - одређује корисника и лозинку који се користе за proxy\n"
+"                   аутентификацију (формат је <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - не приказује има тага (стандардна опција уколико није "
-"дат таг у команди\n"
-"                   линија, некомпатибилна са интерактивним модом).\n"
+"  --bug          - прави извештај о грешци у директоријуму прослеђеном "
+"као                      следећи аргумент.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - не приказује идентичне линије.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - користи X интерфејс.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis се не може користити са --media, --excludemedia, --sortmedia, --"
-"update или --parallel"
+"  --best-output  - бира најбољи интерфејс сходно окружењу:\n"
+"                   X или текстуални мод.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch       - користи дату архитектуру, подразумеваноа је архитектура\n"
-"                    инсталираног Mandrake пакета.\n"
+"  --verify-rpm   - верификује rpm потписе пре инсталације.\n"
+"                   (--no-verify-rpm не веригикује, стандардна је "
+"верификација).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Да ли је овако добро?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - искључује путању раздвојену зарезом.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - искључује docs фајлове.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - користи дати synthesis уместо urpmi-јеве базе.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - бира сва поклапања у командној линији.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "испитујем паралелни држач у фајлу [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p            - дозвољава претраживање по пружању ради налажења пакета.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Нема ничега што би се могло уклонити"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - не претражује доступне ради налажења пакета.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "..импортовани кључ%s од јавног кључа за \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - узрокује fuzzy претрагу (као и  --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "читам хедере са медија \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - следећи пакет је изворни пакет (исто као и  --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - проширује претрагу на зависност пакета.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - тихи режим (мало порука).\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  имена или rpm фајлови дати у командној линији ће бити инсталирани.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
 msgstr ""
-"  --bug          - прави извештај о грешци у директоријуму прослеђеном "
-"као                      следећи аргумент.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "медиј \"%s\" не дефинише ни једну локацију за rpm фајлове"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Шта се може учинити са бинарним rpm пакетима када се користи опција --"
+"install-src"
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "не могу да упишем датотеку листе за \"%s\""
+msgid "Do nothing"
+msgstr "Не ради ништа"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "покушавам да селектујем непостојећи медиј \"%s\""
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - приказује таг описа: опис.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Инсталациjа није успела"
+
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Копирање није успело"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Директоријум  [%s] већ постоји, изаберите други директоријум за пријављивање "
+"багова или га избришите"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - приморава на генерисање hdlist фајлова.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "не могу да направим директоријум [%s] за извештај о грешци"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --list-nodes се може користити само са опцијом --parallel"
+msgid "Copying failed"
+msgstr "Копирање није успело"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "није пронађена hdlist датотека за медиј \"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - следећи пакет је изворни пакет (исто као и  --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Потребан(и) су следећи пакет(и):"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "Инсталирам %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Шта желите? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "читам rpm фајлове са [%s]"
+msgid "Package installation..."
+msgstr "Инсталација пакета..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "копирам описни фајл за \"%s\"..."
+msgid "Initializing..."
+msgstr "покрећем..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - аутоматски селектује пакете од понуђеног.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Неки изабрани пакети се не могу инсталирати:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Уклањање није успело"
+msgid "do you agree ?"
+msgstr "да ли се слажете?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - креира виртуелни медиј који су увек ажурирани ,\n"
-"                   дозвољен је само фајл:// protocol.\n"
+"Инсталација се не може наставити зато што следећи пакети\n"
+"морају бити уклоњени да би остали могли да се ажурирају:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "пакет %s није пронађен."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "уклањам медиј \"%s\""
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Ради задовољења зависности, следећи пакети ће бити инсталирани (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "недостаjе <релативна путaња hdlist> са --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Одустани"
+msgid "unable to get source packages, aborting"
+msgstr "извор пакета ниjе доступан, излазим..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - следећи пакет је изворни пакет (исто као и  -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Убаците медиj са именом %s у уређај [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - користи специфично окружење (типично извештај о грешци).\n"
+msgid "Press Enter when ready..."
+msgstr "Притисните enter када будете спремни..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
+msgid "Downloading package `%s'..."
+msgstr "Скидам пакет `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "не могу да приступим медиjу \"%s\""
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% за %s завршено, време до краја = %s, брзина = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "не могу да креирам медиj \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% завршено, брзина = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - приказује таг packager: packager.\n"
+msgid "The following packages have bad signatures"
+msgstr "Следећи пакети имају неисправне потписе"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Да ли желите да наставите конфигурацију ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Морате да имате root овлашћења да би инсталирали следеће пакете:\n"
+"Инсталација неуспела, недостају неки фајлови.\n"
 "%s\n"
+"Можда желите да ажурирате вашу urpmi базу података."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - приказује лог са изменама.\n"
+msgid "Installation failed"
+msgstr "Инсталациjа није успела"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "не могу да приступим фајлу листе за \"%s\", mедиј игнорисан"
+msgid "distributing %s"
+msgstr "дистрибуирам %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - десна заграда за затварање групе израза.\n"
+msgid "installing %s"
+msgstr "Инсталирам %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch није пронађен, подржани webfetch-ови су: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "испитујем  hdlist фајл [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Инсталиација без провере зависности (дa/Нe)? "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "копирам hdlist фајл..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Присилна инсталација (--force)? (дa/Нe) ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "уписујем листу фајлова за медиј \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d инстлациона трансакција није успела"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "виртулени медиј \"%s\" би требао да има чист url, игноришем медиј"
+msgid "Installation is possible"
+msgstr "Инсталација је могућа"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "све је већ инсталирано"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Не ради ништа"
+msgid "restarting urpmi"
+msgstr "рестартујем urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"употребa: urpmi.addmedia [опције] <име> <url> [with <релативном_путања>]\n"
+"где je <url> jедан од\n"
+"       file://<путaњa>\n"
+"       ftp://<login>:<лозинкa>@<host>/<путaњa> with <релативно име датотекe "
+"сahdlist>\n"
+"       ftp://<host>/<путaњa> with <релативно име датотеке сa hdlist>\n"
+"       http://<host>/<путaњa> with <релативно име датотеке сa hdlist>\n"
+"\n"
+"       removable://<путaњa>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "користим додељени медиј за паралелни мод: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - креира update медиј.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "монтирам %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - покушава да пронађе и користи synthesis фајл.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"не могу да користим медиј \"%s\" пошто се датотеку листе користи други медиј"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - покушава да пронађе и користи hdlist фајл.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "извор пакета ниjе доступан, излазим..."
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - не покушава да пронађе било који synthesis или\n"
+"                   hdlist фајл.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - аутоматски направи све медије са инсталационог\n"
+"                    медија.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% за %s завршено, време до краја = %s, брзина = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - аутоматски направи медијум за XXX-ти део\n"
+"                     диструбиуције, XXX може да буде главни, додатак\n"
+"                     надоградња или блио шта друго што може да се "
+"подеси ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "прорачунавам md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --form        - користи дату url адресу за лист мирора, подразумевано је\n"
+"                    %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "не могу да импортујем јавни кључ за \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - користи дату верзију дистрибуције, default је узета\n"
+"                   из верзије дистрибуције која је наведена у\n"
+"                   деинсталираном mandrake-release пакету.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - никада не тражи деинсталацију пакета, обустави "
-"инсталацију.\n"
+"  --arch       - користи дату архитектуру, подразумеваноа је архитектура\n"
+"                    инсталираног Mandrake пакета.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq верзија %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
-"\n"
-"употреба:\n"
+"  --virtual      - креира виртуелни медиј који су увек ажурирани ,\n"
+"                   дозвољен је само фајл:// protocol.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - деактивира MD5SUM проверу фајла.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - приказује групе укључујући и име.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - чисти директоријум са кешом надглавља.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "медиј \"%s\" није изабран"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - приморава на генерисање hdlist фајлова.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Само администратор може да инсталира пакете"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "не могу да додам надоградње cooker дистрибуцији\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "користим дато окружење на %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "добављам мироре на %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "не могу да пронађем hdlist датотеку за \"%s\", медијум је игнорисан"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "недостаjе <релативна путaња hdlist> са --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - мала дужина трансакције, основна поставка је %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "не могу да aжурирам медиj \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - лева заграда за отоврање групе израза.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "недостаjе <релативна путaња hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "превише тачака монтирања за преносни медиј \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`са недостатком за мрежни ftp медиj\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - инарни AND oоператор, истинит уколико су оба израза "
-"истинита.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "не могу да креирам медиj \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"не могу да приступим медију \"%s\",\n"
-"ово се може десити уколико сте ручно монтирали директоријум приликом "
-"креирања медија."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - приказује таг групе: група.\n"
+"употребa: urpmi.removemedia [-a] <имe> ...\n"
+"где je <имe> име медија за уклaњaњe.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - користи само дати медиј, одвојен зарезом.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - селектује све медије.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "не могу да креирам трансакцију"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"непознате опције '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "нема ничега зa брисaњe (користи urpmi.addmedia за додавaње медиja)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"недостаjе унос за брисaњe\n"
+"(jедан од %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "дистрибуирам %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"употреба: urpmi.update [опције] <име> ...\n"
+"где <име> јесте име медија за ажурирање.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Инсталациjа није успела"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ажурирај само медијум за ажурирање.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "уписујем у конфигурациону датотеку [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - приморава на ажурирање gpg кључа.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - селектује све не преносиве медије.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "нема ничега зa aжурирaњe (користи urpmi.addmedia за додавaње медиja)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - верификује rpm потписе пре инсталације.\n"
-"                   (--no-verify-rpm не веригикује, стандардна је "
-"верификација).\n"
+"недостаjе унос за aжурирaње\n"
+"(jедан од %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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) 2002 MandrakeSoft.\n"
+"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Убаците медиj са именом %s у уређај [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - приказује листу пакета.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - креира update медиј.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media         - приказује листу медија.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media         - приказује листу медија и љихов урл.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - узрокује fuzzy претрагу (као и  --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "У реду"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes         - приказује листу чворова при коришћењу опције --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "неправилан hdlist опис \"%s\" и hdlists фајлу"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases         - приказује листу паралелних алијаса.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "уклањам %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - екстрактује хедере за пакете приказане из urpmi db на\n"
+"                   stdout (само root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - аутоматски направи медијум за XXX-ти део\n"
-"                     диструбиуције, XXX може да буде главни, додатак\n"
-"                     надоградња или блио шта друго што може да се "
-"подеси ;-)\n"
+"  --sources      - приказује све изворне пакете пре download-а (само root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - подешава urpmi у лету са distrib стабла.\n"
+"                   Ова опција дозвољава испитивање дистрибуције.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "да бих задржао %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - приказује лог са изменама.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "због не задовољеног %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - проширује претрагу на зависност пакета.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Аутоматска инсталациjа пакетa...\n"
-"Захтевали сте инсталациjу пакета %s\n"
+"  -u             - уклања пакете уколико је новија верзија већ инсталирана.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi база података закључана"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --verify-rpm   - верификује rpm потписе пре инсталације.\n"
-"                   (--no-verify-rpm не веригикује, стандардна је "
-"верификација).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - потпун излаз са пакетом који треба да се уклони.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "испитукем фајл са јавним кључем за \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - претрага уназад за оним што захтева пакет.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - деактивира MD5SUM проверу фајла.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - приказје корисне информације у, за људе читљивном "
+"облику.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "узимам преносни уређај као \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - приказује групе укључујући и име.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - приказује верзију укључујући и име.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - узрокује fuzzy претрагу (исто као -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - уклања пакете уколико је новија верзија већ инсталирана.\n"
+"  имена или rpm фајлови који су дати у командној линији се проверавају.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - покушава да пронађе и користи hdlist фајл.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "  --list-nodes се може користити само са опцијом --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "због не постојања %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - користи само update медиј.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "нисам нашао пуну листу медија"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"употреба: urpmi.update [опције] <име> ...\n"
-"где <име> јесте име медија за ажурирање.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "покушавам да премостим постојећи медиј \"%s\", избегавам"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Један од следећих пакета је потребан да би инсталирали %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - проверава да ли се може извести исправна инсталација.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq верзија %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "употреба:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Непознати webfetch `%s' !!!\n"
@@ -2154,9 +2200,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "пробајте са urpmf --help да би сте добили списак додатних опција"
 
-#~ msgid "no full media list was found"
-#~ msgstr "нисам нашао пуну листу медија"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "копирам изворну листу за \"%s\"..."
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 4e47659f..1ca11930 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic_<webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -41,873 +41,778 @@ msgstr "DdDdYy"
 msgid "Nn"
 msgstr "NnNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "Instaliram %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automatski napravi sve medije sa instalacionog\n"
-"                    medija.\n"
+"Automatska instalacija paketa...\n"
+"Zahtevali ste instalaciju paketa %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "ne mogu da otvorim rpmdb"
+msgid "Is this OK?"
+msgstr "Da li je ovako dobro?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
+msgid "Ok"
+msgstr "U redu"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Odustani"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "uklanjam paket %s"
+msgid " (Y/n) "
+msgstr " (D/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: komanda nije pronađena\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Ne mogu da koristim paralelni mod sa use-distrib modom"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "sve je već instalirano"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - prikazuje ovaj ekran o pomoći.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - prikazuje tag grupe: grupa.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - čisti direktorijum sa kešom nadglavlja.\n"
+msgid "unknown protocol defined for %s"
+msgstr "nepoznati protokol definisan za %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "koristim proces %d za izvršenje transakcije"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
+msgid "unable to handle protocol: %s"
+msgstr "ne mogu da podržim protokol: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Šta želite? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "sintaksna greška u konfiguracionom fajlu u redu %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "pronađeno %d hedera u keš memoriji"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"medij \"%s\" pokušava da koristi hdlist koja je već korišćena, medij će biti "
+"ignorisan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"medij \"%s\" pokušava da koristi listu koja je već upotrebljena, medij je "
+"ignorisan"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - određuje korisnika i lozinku koji se koriste za proxy\n"
-"                   autentifikaciju (format je <user:password>).\n"
+"ne mogu da koristim medij \"%s\" pošto se datoteku liste koristi drugi medij"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "sada se proveravaju međuzavisnosti paketa\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"ne mogu da koristim ime \"%s\" kao ime za neimenovani medijum zato što je to "
+"ime već u upotrebi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "dobavljam rpm fajl [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ne mogu da uzmem medij \"%s\" u obzir pošto ne postoji lista [%s] "
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases         - prikazuje listu paralelnih alijasa.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ne mogu da odredim medij za ovaj hdlist fajl [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...povraćaj neuspeo: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ne mogu da istražim datoteku liste za \"%s\", medij je ignorisan"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
-"tačan.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtualni medij \"%s\" ne bi trebao da ima definisianu  hdlist ili listu "
+"fajlova, ignorišem medij"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "pogrešno ime rpm datoteke [%s]"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuleni medij \"%s\" bi trebao da ima čist url, ignorišem medij"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "loša proxydeklaracija u komandnoj liniji\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ne mogu da pronađem hdlist datoteku za \"%s\", medijum je ignorisan"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instlaciona transakcija nije uspela"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "nemogu da pronađem datoteku liste za \"%s\", medijum je ignorisan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"ne mogu da pristupim prvom instalacionom mediju (nije pronađen Mandrake/base/"
-"hdlists fajl)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Pogrešan izbor, probajte ponovo\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ne mogu da istražim datoteku liste za \"%s\", medij je ignorisan"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "previše tačaka montiranja za prenosni medij \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
+msgid "taking removable device as \"%s\""
+msgstr "uzimam prenosni uređaj kao \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Sledeći paketi sadrže %s: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Instalacija nije uspela"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "koristeći različit prenosni uređaj ili [%s] za \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - koristi X interfejs.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Potreban(i) su sledeći paket(i):"
+msgid "unable to write config file [%s]"
+msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
+msgid "write config file [%s]"
+msgstr "upisujem u konfiguracionu datoteku [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - bira najbolji interfejs shodno okruženju:\n"
-"                   X ili tekstualni mod.\n"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Ne mogu da koristim paralelni mod sa use-distrib modom"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Skidam paket `%s'..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Šta se može učiniti sa binarnim rpm paketima kada se koristi opcija --"
-"install-src"
+msgid "examining parallel handler in file [%s]"
+msgstr "ispitujem paralelni držač u fajlu [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatska izbor paketa da bi se ažurirao sistem.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "pronađen paralelni držač dza nodove: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "Nema paketa sa imenom %s"
+msgid "using associated media for parallel mode: %s"
+msgstr "koristim dodeljeni medij za paralelni mod: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - bira sva poklapanja u komandnoj liniji.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "ne mogu da koristim paralelnu opciju \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Instalacija neuspela, nedostaju neki fajlovi.\n"
-"%s\n"
-"Možda želite da ažurirate vašu urpmi bazu podataka."
+"--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
+"update ili --parallel"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"upotreba: urpmi.removemedia [-a] <ime> ...\n"
-"gde je <ime> ime medija za uklanjanje.\n"
+msgid "examining synthesis file [%s]"
+msgstr "ispitujem synthesis fajl [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Instalacija se ne može nastaviti zato što sledeći paketi\n"
-"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "ispitujem  hdlist fajl [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`sa nedostatkom za mrežni ftp medij\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtualni medij \"%s\" nije lokalni, ignorišem medij"
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem sa čitanjem hdlist ili synthesis fajla za medij \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "nepoznati paket"
+msgid "performing second pass to compute dependencies\n"
+msgstr "sada se proveravaju međuzavisnosti paketa\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Instalacija je moguća"
+msgid "skipping package %s"
+msgstr "preskačem paket %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Radi zadovoljenja zavisnosti, sledeći paketi će biti instalirani (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "će instalirati umesto ažurirati paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ne mogu da uzmem medij \"%s\" u obzir pošto ne postoji lista [%s] "
+msgid "unable to open rpmdb"
+msgstr "ne mogu da otvorim rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
+msgid "medium \"%s\" already exists"
+msgstr "medij \"%s\" već postoji"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ne mogu da dodam nadogradnje cooker distribuciji\n"
+msgid "virtual medium need to be local"
+msgstr "virtualni medij mora da bude lokalni"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - verbose režim.\n"
+msgid "added medium %s"
+msgstr "dodani medij %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "pokrećem..."
+msgid "unable to access first installation medium"
+msgstr "ne mogu da pristupim prvom instalacionom mediju"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - prikazuje listu paketa.\n"
+msgid "copying hdlists file..."
+msgstr "kopiram hdlist fajl..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
+msgid "...copying failed"
+msgstr "...kopiranje nije uspelo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"nekoherentan medij \"%s\" je označen kao prenosni ali to nije u stvarnosti"
+msgid "...copying done"
+msgstr "...kopiranje završeno"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtualni medij \"%s\" ne bi trebao da ima definisianu  hdlist ili listu "
-"fajlova, ignorišem medij"
+"ne mogu da pristupim prvom instalacionom mediju (nije pronađen Mandrake/base/"
+"hdlists fajl)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "proračunavam md5sum kopirane  source hdlist (ili  synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "dobavljam hdlists fajl..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - isključuje putanju razdvojenu zarezom.\n"
+msgid "...retrieving done"
+msgstr "... dobavljanje završeno"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pritisnite enter kada budete spremni..."
+msgid "...retrieving failed: %s"
+msgstr "...povraćaj neuspeo: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"nepoznate opcije '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "nepravilan hdlist opis \"%s\" i hdlists fajlu"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - izdeli u male transakcije ukoliko će biti instalirano\n"
-"                   više paketa od datog broja,\n"
-"                   default je %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem sa čitanjem hdlist ili synthesis fajla za medij \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "pokušavam da selektujem višestruki medij: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - koristi wget za dobavljanje udaljenih fajlova.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "uklanjam medij \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p            - dozvoljava pretraživanje po pružanju radi nalaženja "
-"paketa.\n"
+"ne mogu da pristupim mediju \"%s\",\n"
+"ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
+"kreiranja medija."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes         - prikazuje listu čvorova pri korišćenju opcije --"
-"parallel.\n"
+"virtualni medij \"%s\" bi trebao da ima ispravan source hdlist ili "
+"synthesis, ignorišem medij"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "kreiram hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kopiram opisni fajl za \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - zadržava postojeće paket ukoliko je moguće, odbacuje "
-"zahtevani paket\n"
-"                   koji vodi uklanjanju.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "proračunavam md5sum postojeće source hdlist (ili synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "ispitujem MD5SUM fajl"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komanda nije pronađena\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to register rpm file"
-msgstr "ne mogu da registrujem  rpm fajl"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopiranje izvorne hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - dozvoljava upit za korisnika da li da instalira pakete "
-"bez\n"
-"                   provere međuzavisnosti paketa.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ne mogu da podržim protokol: %s"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "proračunavam md5sum kopirane  source hdlist (ili  synthesis)"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "dobavljam hdlists fajl..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiranje [%s] neuspelo"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "dodani medij %s"
+msgid "reading rpm files from [%s]"
+msgstr "čitam rpm fajlove sa [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - čuva rpm koji nisu korišćeni u kešu.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ne mogu da pročitam rpm fajlove sa [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"kreirana transakcija za instaliranje na  %s (ukloni=%d, instaliraj=%d, "
-"ažuriraj=%d)"
+msgid "no rpm files found from [%s]"
+msgstr "nema rpm datoteka na [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum ne odgovara"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "sintaksna greška u konfiguracionom fajlu u redu %s"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  imena ili rpm fajlovi dati u komandnoj liniji će biti instalirani.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "proračunavam md5sum of retrieved source hdlist (or synthesis)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - koristi specificirani HTTP proxy, proj porta se "
-"pretpostavlja\n"
-"                   da je 1080 po default-u (format je <proxyhost[:port]>).\n"
+msgid "md5sum mismatch"
+msgstr "md5sum ne odgovara"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to install %s"
-msgstr "da bi instalirao %s"
+#: ../urpm.pm:1483
+#, fuzzy, c-format
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "povraćaj izvorne hdlist (ili synthesis) neuspeo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "premešteni %s unosi u depslist"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "fajl [%s] je već korisšten za isti medij \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "će instalirati umesto ažurirati paket %s"
+msgid "unable to write list file of \"%s\""
+msgstr "ne mogu da upišem datoteku liste za \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "dobavljam mirore na %s ..."
+msgid "writing list file for medium \"%s\""
+msgstr "upisujem listu fajlova za medij \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - prikazuje tag url: url.\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "nema šta da se upiše u datoteku liste za \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "nepoznati protokol definisan za %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - prikazuje verziju uključujući i ime.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "..importovani ključ%s od javnog ključa za \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ne mogu da importujem javni ključ za \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medij \"%s\" već postoji"
+msgid "reading headers from medium \"%s\""
+msgstr "čitam hedere sa medija \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "Instaliram %s\n"
+msgid "building hdlist [%s]"
+msgstr "kreiram hdlist [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"nedostaje unos za ažuriranje\n"
-"(jedan od %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr "pokušavam da prikažem %s"
+msgid "found %d headers in cache"
+msgstr "pronađeno %d hedera u keš memoriji"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ne mogu da uklonim paket %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "uklanjam %d obsolete hhedere u keš memoriji"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
+msgid "mounting %s"
+msgstr "montiram %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"nedostaje unos za brisanje\n"
-"(jedan od %s)\n"
+msgid "unmounting %s"
+msgstr "demontiram %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - selektuje sve medije.\n"
+msgid "relocated %s entries in depslist"
+msgstr "premešteni %s unosi u depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Nedostaje potpis (%s)"
+msgid "no entries relocated in depslist"
+msgstr "nema premeštenih unosa u depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ne mogu da pročitam rpm fajlove sa [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "pogrešno ime rpm datoteke [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuirani urpmi preko mašina sa nadimkom.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "dobavljam rpm fajl [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "ne mogu da pristupim rpm datoteci [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ažuriraj samo medijum za ažuriranje.\n"
+msgid "unable to register rpm file"
+msgstr "ne mogu da registrujem  rpm fajl"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (D/n) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - prikazuje tag grupe: grupa.\n"
+msgid "error registering local packages"
+msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"medij \"%s\" pokušava da koristi listu koja je već upotrebljena, medij je "
-"ignorisan"
+msgid "no package named %s"
+msgstr "Nema paketa sa imenom %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "pogrešan unos: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Sledeći paketi sadrže %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media         - prikazuje listu medija.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Neki izabrani paketi se ne mogu instalirati:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
+"medij \"%s\" koristi fajl sa pogrešnom listom:\n"
+"  miror verovatno nije ažuriran, pokušavam da koristim alternativni metod"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "nema premeštenih unosa u depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "medij \"%s\" ne definiše ni jednu lokaciju za rpm fajlove"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - instalira samo pakete sa izvornim kodom.\n"
+msgid "package %s is not found."
+msgstr "paket %s nije pronađen."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - koristi curl za dobavljanje udaljenih fajlova.\n"
+msgid "urpmi database locked"
+msgstr "urpmi baza podataka zaključana"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "medij \"%s\" nije izabran"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "da li se slažete?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "nekoherentna datoteka liste za \"%s\", medij je ignorisan"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"nekoherentan medij \"%s\" je označen kao prenosni ali to nije u stvarnosti"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "... dobavljanje završeno"
+msgid "unable to access medium \"%s\""
+msgstr "ne mogu da pristupim mediju \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "pogrešan unos: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "preskačem paket %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Neispravan potpis (%s)"
+msgid "Preparing..."
+msgstr "Pripremam..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
+msgid "using process %d for executing transaction"
+msgstr "koristim proces %d za izvršenje transakcije"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i može biti slobodno redistribuiran pod uslovima \n"
-"GNU i GPL. upotreba:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
+"kreirana transakcija za instaliranje na  %s (ukloni=%d, instaliraj=%d, "
+"ažuriraj=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ne mogu da odredim medij za ovaj hdlist fajl [%s]"
+msgid "unable to create transaction"
+msgstr "ne mogu da kreiram transakciju"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
+msgid "removing package %s"
+msgstr "uklanjam paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"medij \"%s\" pokušava da koristi hdlist koja je već korišćena, medij će biti "
-"ignorisan"
+msgid "unable to remove package %s"
+msgstr "ne mogu da uklonim paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "zbog konflikta sa %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "dodajem paket %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "uklanjam %d obsolete hhedere u keš memoriji"
+msgid "unable to install package %s"
+msgstr "ne mogu da instaliram paket %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ne mogu da ažuriram medij \"%s\"\n"
+msgid "due to missing %s"
+msgstr "zbog ne postojanja %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
+msgid "due to unsatisfied %s"
+msgstr "zbog ne zadovoljenog %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtualni medij \"%s\" nije lokalni, ignorišem medij"
+msgid "trying to promote %s"
+msgstr "pokušavam da prikažem %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
+msgid "in order to keep %s"
+msgstr "da bih zadržao %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "koristeći različit prenosni uređaj ili [%s] za \"%s\""
+msgid "in order to install %s"
+msgstr "da bi instalirao %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - ne pokušava da pronađe bilo koji synthesis ili\n"
-"                   hdlist fajl.\n"
+msgid "due to conflicts with %s"
+msgstr "zbog konflikta sa %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ne pretražuje dostupne radi nalaženja paketa.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiranje [%s] neuspelo"
+msgid "unrequested"
+msgstr "nezahtevano"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - podešava urpmi u letu sa distrib stabla.\n"
-"                   Ova opcija dozvoljava ispitivanje distribucije.\n"
+msgid "Invalid signature (%s)"
+msgstr "Neispravan potpis (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Pogrešan ID ključa(%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - uklanja rpm iz keša pre bilo čega drugog.\n"
+msgid "Missing signature (%s)"
+msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"ne mogu da koristim ime \"%s\" kao ime za neimenovani medijum zato što je to "
-"ime već u upotrebi"
+msgid "bad proxy declaration on command line\n"
+msgstr "loša proxydeklaracija u komandnoj liniji\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"virtualni medij \"%s\" bi trebao da ima ispravan source hdlist ili "
-"synthesis, ignorišem medij"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Pogrešan izbor, probajte ponovo\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -924,1076 +829,1217 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatski selektuje pakete od ponuđenog.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanja>]\n"
-"gde je <url> jedan od\n"
-"       file://<putanja>\n"
-"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativno ime datoteke "
-"sahdlist>\n"
-"       ftp://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
-"       http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
-"\n"
-"       removable://<putanja>\n"
+"  --test         - proverava da li se može izvesti ispravna instalacija.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopiranje izvorne hdlist (ili synthesis) za \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - primorava na invokaciju čak i ako neki paketi ne "
+"postoje.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiranje završeno"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuirani urpmi preko mašina sa nadimkom.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ne mogu da koristim paralelnu opciju \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"medij \"%s\" koristi fajl sa pogrešnom listom:\n"
-"  miror verovatno nije ažuriran, pokušavam da koristim alternativni metod"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ne mogu da pristupim prvom instalacionom mediju"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - verbose režim.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtualni medij mora da bude lokalni"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "greška pri registrovanju lokalnih paketa"
+msgid "unknown packages"
+msgstr "nepoznati paketi"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitira brzinu download-a.\n"
+msgid "unknown package"
+msgstr "nepoznati paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
+msgid "removing package %s will break your system"
+msgstr "uklanjanje paketa %s će narušiti Vaš sistem"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "povraćaj izvorne hdlist (ili synthesis) neuspeo"
+#: ../urpme:95
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nema rpm datoteka na [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Proveravam kako bih uklonio sledeće pakete"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "nema šta da se upiše u datoteku liste za \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sledeći paketi imaju neispravne potpise"
+msgid " (y/N) "
+msgstr " (d/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "proračunavam md5sum postojeće source hdlist (ili synthesis)"
+msgid "removing %s"
+msgstr "uklanjam %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c              - potpun izlaz sa paketom koji treba da se ukloni.\n"
+msgid "Removing failed"
+msgstr "Uklanjanje nije uspelo"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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) 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "ne mogu da instaliram paket %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo update medij.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - dozovoljava upit korisnika da li želi da instalira pakete "
-"bez\n"
-"                   provere međuzavisnosti i integriteta.\n"
+"  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose režim.\n"
+
+#: ../urpmf:39
+#, c-format
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
+"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
+"dat tag u komandi\n"
+"                   linija, nekompatibilna sa interaktivnim modom).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - ne prikazuje identične linije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - prikazuje tag grupe: grupa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Pogrešan ID ključa(%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - primorava na invokaciju čak i ako neki paketi ne "
-"postoje.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - pokušava da pronađe i koristi synthesis fajl.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - prikazuje tag opisa: opis.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - primorava na ažuriranje gpg ključa.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - prikazuje tag packager: packager.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "nedostaje <relativna putanja hdlist>\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Proveravam kako bih uklonio sledeće pakete"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - prikazuje tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "nezahtevano"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu da pristupim rpm datoteci [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files         - prikazuje tag fajlove: sve fajlove.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Da li želite da nastavite konfiguraciju ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ne mogu da pročitam rpm datoteku [%s] sa medija \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - koristi specifično okruženje (tipično izveštaj o "
+"grešci).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - prikazje korisne informacije u, za ljude čitljivnom "
-"obliku.\n"
+"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
+"ime.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - koristi datu verziju distribucije, default je uzeta\n"
-"                   iz verzije distribucije koja je navedena u\n"
-"                   deinstaliranom mandrake-release paketu.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --form        - koristi datu url adresu za list mirora, podrazumevano je\n"
-"                    %s\n"
+"  -a             - inarni AND ooperator, istinit ukoliko su oba izraza "
+"istinita.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
+"tačan.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - binarni NOT, istinit ukoliko je izraz pogrešan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - leva zagrada za otovranje grupe izraza.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Direktorijum  [%s] već postoji, izaberite drugi direktorijum za "
-"prijavljivanje bagova ili ga izbrišite"
+"povratni je :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "demontiram %s"
+msgid "using specific environment on %s\n"
+msgstr "koristim dato okruženje na %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% završeno, brzina = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzija %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i može biti slobodno redistribuiran pod uslovima \n"
+"GNU i GPL. upotreba:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "restartujem urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "ispitujem synthesis fajl [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - automatska izbor paketa da bi se ažurirao sistem.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
+"instalaciju.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiranje nije uspelo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - zadržava postojeće paket ukoliko je moguće, odbacuje "
+"zahtevani paket\n"
+"                   koji vodi uklanjanju.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - izdeli u male transakcije ukoliko će biti instalirano\n"
+"                   više paketa od datog broja,\n"
+"                   default je %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tihi režim (malo poruka).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - mala dužina transakcije, osnovna postavka je %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose režim.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - uzrokuje fuzzy pretragu (isto kao -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - prikazuje sve izvorne pakete pre download-a (samo root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - sledeći paket je izvorni paket (isto kao i  -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - ekstraktuje hedere za pakete prikazane iz urpmi db na\n"
-"                   stdout (samo root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - instalira samo pakete sa izvornim kodom.\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "nepoznati paketi"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - uklanja rpm iz keša pre bilo čega drugog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "pokušavam da selektujem višestruki medij: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - čuva rpm koji nisu korišćeni u kešu.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
-"ime.\n"
+"  --allow-nodeps - dozvoljava upit za korisnika da li da instalira pakete "
+"bez\n"
+"                   provere međuzavisnosti paketa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "fajl [%s] je već korisšten za isti medij \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - dozovoljava upit korisnika da li želi da instalira pakete "
+"bez\n"
+"                   provere međuzavisnosti i integriteta.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nema ničega za brisanje (koristi urpmi.addmedia za dodavanje medija)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "nemogu da pronađem datoteku liste za \"%s\", medijum je ignorisan"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - koristi wget za dobavljanje udaljenih fajlova.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - prikazuje ovaj ekran o pomoći.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - koristi curl za dobavljanje udaljenih fajlova.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "pronađen paralelni držač dza nodove: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitira brzinu download-a.\n"
 
-#: ../urpmf:1
-#, c-format
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"povratni je :\n"
-"%s\n"
+"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
+"                   (--no-verify-rpm ne verigikuje, standardna je "
+"verifikacija).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - pretraga unazad za onim što zahteva paket.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - koristi specificirani HTTP proxy, proj porta se "
+"pretpostavlja\n"
+"                   da je 1080 po default-u (format je <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmq verzija %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
-"\n"
-"upotreba:\n"
+"  --proxy-user   - određuje korisnika i lozinku koji se koriste za proxy\n"
+"                   autentifikaciju (format je <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - ne prikazuje ima taga (standardna opcija ukoliko nije "
-"dat tag u komandi\n"
-"                   linija, nekompatibilna sa interaktivnim modom).\n"
+"  --bug          - pravi izveštaj o grešci u direktorijumu prosleđenom "
+"kao                      sledeći argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - ne prikazuje identične linije.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - koristi X interfejs.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
-"update ili --parallel"
+"  --best-output  - bira najbolji interfejs shodno okruženju:\n"
+"                   X ili tekstualni mod.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch       - koristi datu arhitekturu, podrazumevanoa je arhitektura\n"
-"                    instaliranog Mandrake paketa.\n"
+"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
+"                   (--no-verify-rpm ne verigikuje, standardna je "
+"verifikacija).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Da li je ovako dobro?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - isključuje putanju razdvojenu zarezom.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - isključuje docs fajlove.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - bira sva poklapanja u komandnoj liniji.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "ispitujem paralelni držač u fajlu [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p            - dozvoljava pretraživanje po pružanju radi nalaženja "
+"paketa.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Nema ničega što bi se moglo ukloniti"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ne pretražuje dostupne radi nalaženja paketa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "..importovani ključ%s od javnog ključa za \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - uzrokuje fuzzy pretragu (kao i  --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "čitam hedere sa medija \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - sledeći paket je izvorni paket (isto kao i  --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - proširuje pretragu na zavisnost paketa.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tihi režim (malo poruka).\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  imena ili rpm fajlovi dati u komandnoj liniji će biti instalirani.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
 msgstr ""
-"  --bug          - pravi izveštaj o grešci u direktorijumu prosleđenom "
-"kao                      sledeći argument.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "medij \"%s\" ne definiše ni jednu lokaciju za rpm fajlove"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Šta se može učiniti sa binarnim rpm paketima kada se koristi opcija --"
+"install-src"
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ne mogu da upišem datoteku liste za \"%s\""
+msgid "Do nothing"
+msgstr "Ne radi ništa"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - prikazuje tag opisa: opis.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Instalacija nije uspela"
+
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiranje nije uspelo"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Direktorijum  [%s] već postoji, izaberite drugi direktorijum za "
+"prijavljivanje bagova ili ga izbrišite"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ne mogu da napravim direktorijum [%s] za izveštaj o grešci"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "  --list-nodes se može koristiti samo sa opcijom --parallel"
+msgid "Copying failed"
+msgstr "Kopiranje nije uspelo"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - sledeći paket je izvorni paket (isto kao i  --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Potreban(i) su sledeći paket(i):"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "Instaliram %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Šta želite? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "čitam rpm fajlove sa [%s]"
+msgid "Package installation..."
+msgstr "Instalacija paketa..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopiram opisni fajl za \"%s\"..."
+msgid "Initializing..."
+msgstr "pokrećem..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatski selektuje pakete od ponuđenog.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Neki izabrani paketi se ne mogu instalirati:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Uklanjanje nije uspelo"
+msgid "do you agree ?"
+msgstr "da li se slažete?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - kreira virtuelni medij koji su uvek ažurirani ,\n"
-"                   dozvoljen je samo fajl:// protocol.\n"
+"Instalacija se ne može nastaviti zato što sledeći paketi\n"
+"moraju biti uklonjeni da bi ostali mogli da se ažuriraju:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "paket %s nije pronađen."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "uklanjam medij \"%s\""
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Radi zadovoljenja zavisnosti, sledeći paketi će biti instalirani (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "nedostaje <relativna putanja hdlist> sa --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Odustani"
+msgid "unable to get source packages, aborting"
+msgstr "izvor paketa nije dostupan, izlazim..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - sledeći paket je izvorni paket (isto kao i  -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - koristi specifično okruženje (tipično izveštaj o "
-"grešci).\n"
+msgid "Press Enter when ready..."
+msgstr "Pritisnite enter kada budete spremni..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
+msgid "Downloading package `%s'..."
+msgstr "Skidam paket `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ne mogu da pristupim mediju \"%s\""
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% za %s završeno, vreme do kraja = %s, brzina = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ne mogu da kreiram medij \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% završeno, brzina = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - prikazuje tag packager: packager.\n"
+msgid "The following packages have bad signatures"
+msgstr "Sledeći paketi imaju neispravne potpise"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Da li želite da nastavite konfiguraciju ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Morate da imate root ovlašćenja da bi instalirali sledeće pakete:\n"
+"Instalacija neuspela, nedostaju neki fajlovi.\n"
 "%s\n"
+"Možda želite da ažurirate vašu urpmi bazu podataka."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - prikazuje log sa izmenama.\n"
+msgid "Installation failed"
+msgstr "Instalacija nije uspela"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
+msgid "distributing %s"
+msgstr "distribuiram %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
+msgid "installing %s"
+msgstr "Instaliram %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch nije pronađen, podržani webfetch-ovi su: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "ispitujem  hdlist fajl [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopiram hdlist fajl..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "upisujem listu fajlova za medij \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d instlaciona transakcija nije uspela"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuleni medij \"%s\" bi trebao da ima čist url, ignorišem medij"
+msgid "Installation is possible"
+msgstr "Instalacija je moguća"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "sve je već instalirano"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Ne radi ništa"
+msgid "restarting urpmi"
+msgstr "restartujem urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativnom_putanja>]\n"
+"gde je <url> jedan od\n"
+"       file://<putanja>\n"
+"       ftp://<login>:<lozinka>@<host>/<putanja> with <relativno ime datoteke "
+"sahdlist>\n"
+"       ftp://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
+"       http://<host>/<putanja> with <relativno ime datoteke sa hdlist>\n"
+"\n"
+"       removable://<putanja>\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "koristim dodeljeni medij za paralelni mod: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - kreira update medij.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "montiram %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - pokušava da pronađe i koristi synthesis fajl.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"ne mogu da koristim medij \"%s\" pošto se datoteku liste koristi drugi medij"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - pokušava da pronađe i koristi hdlist fajl.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "izvor paketa nije dostupan, izlazim..."
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - ne pokušava da pronađe bilo koji synthesis ili\n"
+"                   hdlist fajl.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatski napravi sve medije sa instalacionog\n"
+"                    medija.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% za %s završeno, vreme do kraja = %s, brzina = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automatski napravi medijum za XXX-ti deo\n"
+"                     distrubiucije, XXX može da bude glavni, dodatak\n"
+"                     nadogradnja ili blio šta drugo što može da se "
+"podesi ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "proračunavam md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --form        - koristi datu url adresu za list mirora, podrazumevano je\n"
+"                    %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ne mogu da importujem javni ključ za \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - koristi datu verziju distribucije, default je uzeta\n"
+"                   iz verzije distribucije koja je navedena u\n"
+"                   deinstaliranom mandrake-release paketu.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - nikada ne traži deinstalaciju paketa, obustavi "
-"instalaciju.\n"
+"  --arch       - koristi datu arhitekturu, podrazumevanoa je arhitektura\n"
+"                    instaliranog Mandrake paketa.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
+"  --virtual      - kreira virtuelni medij koji su uvek ažurirani ,\n"
+"                   dozvoljen je samo fajl:// protocol.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - deaktivira MD5SUM proveru fajla.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - prikazuje grupe uključujući i ime.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - čisti direktorijum sa kešom nadglavlja.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medij \"%s\" nije izabran"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Samo administrator može da instalira pakete"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ne mogu da dodam nadogradnje cooker distribuciji\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim dato okruženje na %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "dobavljam mirore na %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ne mogu da pronađem hdlist datoteku za \"%s\", medijum je ignorisan"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "nedostaje <relativna putanja hdlist> sa --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - mala dužina transakcije, osnovna postavka je %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "ne mogu da ažuriram medij \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - leva zagrada za otovranje grupe izraza.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "nedostaje <relativna putanja hdlist>\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "previše tačaka montiranja za prenosni medij \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`sa nedostatkom za mrežni ftp medij\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - inarni AND ooperator, istinit ukoliko su oba izraza "
-"istinita.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "ne mogu da kreiram medij \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"ne mogu da pristupim mediju \"%s\",\n"
-"ovo se može desiti ukoliko ste ručno montirali direktorijum prilikom "
-"kreiranja medija."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - prikazuje tag grupe: grupa.\n"
+"upotreba: urpmi.removemedia [-a] <ime> ...\n"
+"gde je <ime> ime medija za uklanjanje.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - selektuje sve medije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "ne mogu da kreiram transakciju"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"nepoznate opcije '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "nema ničega za brisanje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"nedostaje unos za brisanje\n"
+"(jedan od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuiram %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"upotreba: urpmi.update [opcije] <ime> ...\n"
+"gde <ime> jeste ime medija za ažuriranje.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspela"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ažuriraj samo medijum za ažuriranje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "upisujem u konfiguracionu datoteku [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - primorava na ažuriranje gpg ključa.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - selektuje sve ne prenosive medije.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
-"                   (--no-verify-rpm ne verigikuje, standardna je "
-"verifikacija).\n"
+"nedostaje unos za ažuriranje\n"
+"(jedan od %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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) 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - prikazuje listu paketa.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreira update medij.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media         - prikazuje listu medija.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media         - prikazuje listu medija i ljihov url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - uzrokuje fuzzy pretragu (kao i  --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "U redu"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes         - prikazuje listu čvorova pri korišćenju opcije --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "nepravilan hdlist opis \"%s\" i hdlists fajlu"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases         - prikazuje listu paralelnih alijasa.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "uklanjam %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - ekstraktuje hedere za pakete prikazane iz urpmi db na\n"
+"                   stdout (samo root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automatski napravi medijum za XXX-ti deo\n"
-"                     distrubiucije, XXX može da bude glavni, dodatak\n"
-"                     nadogradnja ili blio šta drugo što može da se "
-"podesi ;-)\n"
+"  --sources      - prikazuje sve izvorne pakete pre download-a (samo root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - podešava urpmi u letu sa distrib stabla.\n"
+"                   Ova opcija dozvoljava ispitivanje distribucije.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "da bih zadržao %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - prikazuje log sa izmenama.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "zbog ne zadovoljenog %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - proširuje pretragu na zavisnost paketa.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatska instalacija paketa...\n"
-"Zahtevali ste instalaciju paketa %s\n"
+"  -u             - uklanja pakete ukoliko je novija verzija već "
+"instalirana.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi baza podataka zaključana"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --verify-rpm   - verifikuje rpm potpise pre instalacije.\n"
-"                   (--no-verify-rpm ne verigikuje, standardna je "
-"verifikacija).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c              - potpun izlaz sa paketom koji treba da se ukloni.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - pretraga unazad za onim što zahteva paket.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - deaktivira MD5SUM proveru fajla.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - prikazje korisne informacije u, za ljude čitljivnom "
+"obliku.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "uzimam prenosni uređaj kao \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - prikazuje grupe uključujući i ime.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - prikazuje verziju uključujući i ime.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - uzrokuje fuzzy pretragu (isto kao -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - uklanja pakete ukoliko je novija verzija već "
-"instalirana.\n"
+"  imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - pokušava da pronađe i koristi hdlist fajl.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "  --list-nodes se može koristiti samo sa opcijom --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "zbog ne postojanja %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo update medij.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "nisam našao punu listu medija"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"upotreba: urpmi.update [opcije] <ime> ...\n"
-"gde <ime> jeste ime medija za ažuriranje.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Jedan od sledećih paketa je potreban da bi instalirali %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - proverava da li se može izvesti ispravna instalacija.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Nepoznati webfetch `%s' !!!\n"
@@ -2159,9 +2205,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "probajte sa urpmf --help da bi ste dobili spisak dodatnih opcija"
 
-#~ msgid "no full media list was found"
-#~ msgstr "nisam našao punu listu medija"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "kopiram izvornu listu za \"%s\"..."
 
diff --git a/po/sv.po b/po/sv.po
index b979f21c..633fbf2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-27 11:05+0100\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -48,871 +48,777 @@ msgstr "JjYy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "installerar %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - skapa automatiskt all media från ett\n"
-"                 installationsmedia.\n"
+"Automatisk installation av paket.\n"
+"Du begärde installation av paketet %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "kunde inte öppna RPM-db"
+msgid "Is this OK?"
+msgstr "Är det OK?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - visar det här hjälpmeddelandet.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "tar bort paket %s"
+msgid " (Y/n) "
+msgstr " (J/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: kommandot kunde inte hittas\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Kan ej använda parallellt läge med use-distrib läge"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"användning: %s [flaggor]\n"
+"där [flaggor] är från\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "allt är redan installerat"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - visar det här hjälpmeddelandet.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - rensa huvudcachekatalogen.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - begränsa resultat till aktuell grupp.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "använder process %d för exekvering av transaktion"
+msgid "                    defaults is %s.\n"
+msgstr "                    default är %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides      - visa taggen \"provides\": allt som tillhandahålls.\n"
+msgid "unknown protocol defined for %s"
+msgstr "okänt protokoll definierat för %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Vad är ditt val? ( 1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "hittade %d huvuden i cachen"
+msgid "unable to handle protocol: %s"
+msgstr "kan inte hantera protokoll: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "det finns flera paket med samma RPM-filnamn \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntaxfel i inställningsfil på rad %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - ange användare och lösenord för proxy-\n"
-"                   autentisering (formatet är <användare:lösenord>).\n"
+"media \"%s\" försöker använda en hdlist som redan används, media ignorerat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "utför andra passet för att räkna ut beroenden\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"media \"%s\" försöker använda en lista som redan används, media ignorerat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "hämtar RPM-fil [%s]..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"kan ej använda media \"%s\" eftersom listfilen redan används av ett annat "
+"media"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - lista tillgängliga parallellalias.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"kan inte använda namn \"%s\" för namnlöst media eftersom det redan används"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...hämtning misslyckades: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "Kan ej behandla media \"%s\" eftersom ingen fillista [%s] existerar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "kunde inte inspektera listfil för \"%s\", media ignorerat"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "kan inte avgöra media för den här hdlist-filen [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "  -o             - binär OR operator, sant om ett uttryck är sant.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "kunde inte komma åt hdlist-fil för \"%s\", media ignorerat"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Paketinstallation..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "kunde inte komma åt listfil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ogiltigt RPM-filnamn [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "försöker gå förbi befintligt media \"%s\", undviker"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "felaktig proxydeklaration på kommandorad\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virutellt media \"%s\" bör inte ha en hdlist eller listfil definierad, media "
+"ignorerat"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installationstransaktioner misslyckades"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "virtuellt media \"%s\" bör ha en tydlig URL, media ignorerat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"kan inte läsa det första installationsmediumet (hittade ingen Mandrake/base/"
-"hdlists-fil)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "kunde inte hitta hdlist-fil för \"%s\", media ignorerat"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Felaktigt val, försök igen.\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "kunde inte hitta listfil för \"%s\", media ignorerat"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Välj var filen ska sparas"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "Felaktiv listfil för \"%s\", ignorerar media"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - visa taggen \"summary\": sammanfattning.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "kunde inte inspektera listfil för \"%s\", media ignorerat"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Följande paket innehåller %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "för många monteringspunkter för flyttbar media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Installera det"
+msgid "taking removable device as \"%s\""
+msgstr "tar flyttbar enhet som \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - använd X-gränssnitt.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "använder annan flyttbar enhet [%s] för \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Ett av följande paket är nödvändigt:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"För att tillfredsställa beroenden kommer följande paket att tas bort (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "kan inte skriva inställningsfil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - välj det bästa gränssnittet enligt miljön:\n"
-"                   X eller textläge.\n"
+msgid "write config file [%s]"
+msgstr "skriv inställningsfil [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Laddar ner paket \"%s\"..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Kan ej använda parallellt läge med use-distrib läge"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Vad kan göras med binära RPM-filer när -install-src används"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "kan inte tyda \"%s\" i fil [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "undersöker parallell hanterare i fil [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "inget paket med namn %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "hittade parallella hanterare för noder: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - välj alla träffar på kommandoraden.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "använder associerad media för parallelläge: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Installationen misslyckades, vissa filer saknas:\n"
-"%s\n"
-"Du bör försöka uppdatera urpmi-databasen."
+msgid "unable to use parallel option \"%s\""
+msgstr "kan inte använda parallellalternativ \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"användning: urpmi.removemedia [-a] <namn>...\n"
-"där <namn> är medianamnet som ska tas bort.\n"
+"--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
+"update eller --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Installationen kan inte fortsätta eftersom följande paket måste\n"
-"tas bort så att andra kan uppdateras:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "undersöker synthesis-fil [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "\"with\" saknas för nätverksmedia\n"
+msgid "examining hdlist file [%s]"
+msgstr "undersöker hdlist-fil [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - lista filerna i paketet.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "Virtuellt media \"%s\" är inte tillgängligt lokalt, ignorerar media"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "okänt paket"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problem med att läsa hdlist- eller synthesis-fil för media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Installation är möjlig"
+msgid "performing second pass to compute dependencies\n"
+msgstr "utför andra passet för att räkna ut beroenden\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "hoppar över paket %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"För att tillfredsställa beroenden kommer följande paket att installeras (%d "
-"MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "skulle installera istället för att uppdatera paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "Kan ej behandla media \"%s\" eftersom ingen fillista [%s] existerar"
+msgid "unable to open rpmdb"
+msgstr "kunde inte öppna RPM-db"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
+msgid "medium \"%s\" already exists"
+msgstr "media \"%s\" finns redan"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "kan inte lägga till uppdateringar från en cooker-distribution\n"
+msgid "virtual medium need to be local"
+msgstr "virtuell media måste vara lokal"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - utförligt läge.\n"
+msgid "added medium %s"
+msgstr "lade till media %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Initierar..."
+msgid "unable to access first installation medium"
+msgstr "kan inte komma åt det första installationsmediat"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - visa tillgängliga paket.\n"
+msgid "copying hdlists file..."
+msgstr "kopierar hdlist-fil..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - visa alla taggar.\n"
+msgid "...copying failed"
+msgstr "...kopiering misslyckades"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
+msgid "...copying done"
+msgstr "...kopiering klar"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virutellt media \"%s\" bör inte ha en hdlist eller listfil definierad, media "
-"ignorerat"
+"kan inte läsa det första installationsmediumet (hittade ingen Mandrake/base/"
+"hdlists-fil)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "Beräknar MD5-summa för kopierad käll-hdlist (eller synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "hämtar hdlist-fil..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - ignorera sökväg separerad av komma.\n"
+msgid "...retrieving done"
+msgstr "...hämtning klar"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Tryck \"Enter\" vid klart..."
+msgid "...retrieving failed: %s"
+msgstr "...hämtning misslyckades: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"okända flaggor \"%s\"\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "ogiltig hdlist-beskrivning \"%s\" i hdlist-fil"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  -dela upp i små transaktioner om fler än angivna paket\n"
-"                   kommer att installeras eller uppdateras,\n"
-"                   förvalt alternativ är %d\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "försöker välja media som inte finns \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problem med att läsa hdlist- eller synthesis-fil för media \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "väljer flera media: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
+msgid "removing medium \"%s\""
+msgstr "tar bort media \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - visa tillgängliga noder vid användning av --parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "bygger hdlist [%s]"
+"Kan inte läsa media \"%s\",\n"
+"detta kan hända om du manuellt monterade katalogen när du skapade detta "
+"media."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - behåll om möjligt existerande paket, ignorera "
-"efterfrågade \n"
-"                   paket som leder till avinstalleringar.\n"
+"Virtuellt media \"%s\" bör ha giltig hdlist- eller synthesis-källa, media\n"
+"ignorerat"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "undersöker MD5SUM-fil"
+msgid "copying description file of \"%s\"..."
+msgstr "kopierar beskrivningsfil för \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: kommandot kunde inte hittas\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "Beräknar MD5-summa för existerande hdlist- (eller synthesis) källa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "kan inte registrera RPM-fil"
+msgid "examining MD5SUM file"
+msgstr "undersöker MD5SUM-fil"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - tillåter användaren installera paket utan\n"
-"                   att kontrollera beroenden.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kopierar käll-hdlist (eller synthesis) för \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "kan inte hantera protokoll: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hämtar hdlist-fil..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "Beräknar MD5-summa för kopierad käll-hdlist (eller synthesis)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Ja, installera paketet"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "kopiering av [%s] misslyckades (md5sum stämmer inte)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "lade till media %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problem med att läsa synthesis-fil för media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - behåll rpm som inte används i cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "läser RPM-filer från [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
-"uppdatera=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "kan inte läsa RPM-filer från [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "felaktig MD5-summa"
+msgid "no rpm files found from [%s]"
+msgstr "inga RPM-filer hittade från [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntaxfel i inställningsfil på rad %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  namn eller rpm-filer som anges på kommandoraden installeras.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "hittat undersökt hdlist (eller synthesis) som %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - använd specificerad HTTP-proxy, portnumret antas\n"
-"                   vara 1080 som standard (formatet är <proxydator[:port]"
-">).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "beräknar MD5-summa för hämtade hdlist- (eller syntheses) källor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "för att installera %s"
+msgid "md5sum mismatch"
+msgstr "felaktig MD5-summa"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "relokerade %s poster i depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "hämtning av käll-hdlist (eller synthesis) misslyckades"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - versaler och gemener jämförs lika i varje mönster.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ingen hdlist-fil hittad för media \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Kunde inte skapa katalog [%s] för felrapport"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "filen [%s] används redan i samma media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "skulle installera istället för att uppdatera paket %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "kunde ej tyda hdlist-fil för \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "hämtar speglar på %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "kunde inte skriva listfil för \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url         - visa taggen \"url\": url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "skriver listfil för media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "okänt protokoll definierat för %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "ingenting skrivet i listfilen för \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - visa version och utgåva med namn.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - visa taggen \"obsoletes\": alla inaktuella.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "media \"%s\" finns redan"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "installerar %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "läser huvuden från media \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"objektet som ska uppdateras saknas\n"
-"(en av %s)\n"
+msgid "building hdlist [%s]"
+msgstr "bygger hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "försöker befordra %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "bygg dhlist synthesis fil för media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "kan inte ta bort paket %s"
+msgid "found %d headers in cache"
+msgstr "hittade %d huvuden i cachen"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problem med att läsa synthesis-fil för media \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "tar bort %d inaktuella huvuden i cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"objektet som ska tas bort saknas\n"
-"(en av %s)\n"
+msgid "mounting %s"
+msgstr "monterar %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - välj all media.\n"
+msgid "unmounting %s"
+msgstr "avmonterar %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Signatur saknas (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "relokerade %s poster i depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "kan inte läsa RPM-filer från [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "inga poster relokerade i depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuerad urpmi över alla maskiner med alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "ogiltigt RPM-filnamn [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "hämtar RPM-fil [%s]..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - uppdatera endast uppdateringsmedia.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "kan inte läsa rpm-fil [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (J/n) "
+msgid "unable to register rpm file"
+msgstr "kan inte registrera RPM-fil"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - begränsa resultat till aktuell grupp.\n"
+msgid "error registering local packages"
+msgstr "fel vid registrering av lokala paket"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"media \"%s\" försöker använda en lista som redan används, media ignorerat"
+msgid "no package named %s"
+msgstr "inget paket med namn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "felaktig inmatning: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Följande paket innehåller %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "att ta bort paketet %s skulle förstöra systemet"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "det finns flera paket med samma RPM-filnamn \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   -   visa tillgänglig media.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "kunde inte tyda [%s] på värde \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Vissa begärda paket kan inte installeras:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Installerar paket \"%s\" (%s/%s)..."
+"Media \"%s\" använder en ogiltig listfil:\n"
+"  spegeln är antagligen inaktuell, försök använda en alternativ metod"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "inga poster relokerade i depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "media \"%s\" definierar inte någon plats för RPM-filer"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - installera endast källpaket (inga binärer).\n"
+msgid "package %s is not found."
+msgstr "paketet %s hittas inte."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
+msgid "urpmi database locked"
+msgstr "urpmi-databas låst"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "mediat \"%s\" är inte valt"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "accepterar du?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "kunde inte läsa RPM-fil [%s] från media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "Felaktiv listfil för \"%s\", ignorerar media"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...hämtning klar"
+msgid "unable to access medium \"%s\""
+msgstr "kunde inte komma åt media \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "lägger till paket %s (id=%d, eid=%d, uppdatera=%d, fil=%s)"
+msgid "malformed input: [%s]"
+msgstr "felaktig inmatning: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "hoppar över paket %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "hämtar RPM-filer från media \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ogiltig signatur (%s)"
+msgid "Preparing..."
+msgstr "Förbereder..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-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"
+msgid "using process %d for executing transaction"
+msgstr "använder process %d för exekvering av transaktion"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright © 1999, 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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "kunde inte tyda [%s] på värde \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia         - använd inte givet media, separerat med komma.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "kan inte avgöra media för den här hdlist-filen [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "kunde ej tyda hdlist-fil för \"%s\""
+"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
+"uppdatera=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"media \"%s\" försöker använda en hdlist som redan används, media ignorerat"
+msgid "unable to create transaction"
+msgstr "kunde inte skapa transaktion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "på grund av konflikter med %s"
+msgid "removing package %s"
+msgstr "tar bort paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "tar bort %d inaktuella huvuden i cache"
+msgid "unable to remove package %s"
+msgstr "kan inte ta bort paket %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "kunde ej uppdatera media \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "lägger till paket %s (id=%d, eid=%d, uppdatera=%d, fil=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
+msgid "unable to install package %s"
+msgstr "kan inte installera paket %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "Virtuellt media \"%s\" är inte tillgängligt lokalt, ignorerar media"
+msgid "due to missing %s"
+msgstr "för att %s saknas"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Förbereder..."
+msgid "due to unsatisfied %s"
+msgstr "på grund av otillräckliga %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    default är %s.\n"
+msgid "trying to promote %s"
+msgstr "försöker befordra %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "använder annan flyttbar enhet [%s] för \"%s\""
+msgid "in order to keep %s"
+msgstr "för att behålla %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - försök ej hitta någon synthesis- eller\n"
-"                   hdlist-fil.\n"
+msgid "in order to install %s"
+msgstr "för att installera %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
+msgid "due to conflicts with %s"
+msgstr "på grund av konflikter med %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "kopiering av [%s] misslyckades (md5sum stämmer inte)"
+msgid "unrequested"
+msgstr "obegärd"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
-"distributionsträd.\n"
-"                   Detta tillåter kontroll av distribution.\n"
+msgid "Invalid signature (%s)"
+msgstr "Ogiltig signatur (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"användning: %s [flaggor]\n"
-"där [flaggor] är från\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Ogiltigt nyckel-id (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean      - ta bort rpm från cache före allt annat.\n"
+msgid "Missing signature (%s)"
+msgstr "Signatur saknas (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"kan inte använda namn \"%s\" för namnlöst media eftersom det redan används"
+msgid "bad proxy declaration on command line\n"
+msgstr "felaktig proxydeklaration på kommandorad\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - visa taggen \"conflicts\": alla konflikter.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"Virtuellt media \"%s\" bör ha giltig hdlist- eller synthesis-källa, media\n"
-"ignorerat"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Felaktigt val, försök igen.\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -928,1085 +834,1225 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - visar det här hjälpmeddelandet.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - välj automatiskt ett paket från valen.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"användning: urpmi.addmedia [flaggor] <namn> <webbadress (url)> [with "
-"<relativ_sökväg>]\n"
-"där <webbadress> är en av\n"
-"       file://<sökväg>\n"
-"       ftp://<användarnamn>:<lösenord>@<värddator>/<sökväg> with <relativt "
-"filnamn till hdlist>\n"
-"       ftp://<värddator>/<sökväg> with <relativt filnamn till hdlist>\n"
-"       http://<värddator>/<sökväg> with <relativt filnamn till hdlist>\n"
-"       removable://<sökväg>\n"
-"\n"
-"och [flaggor] är från\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - verifiera om installationen kan utföras korrekt.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kopierar käll-hdlist (eller synthesis) för \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - tvinga användning även om vissa paket inte finns.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...kopiering klar"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuerad urpmi över alla maskiner med alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "kan inte använda parallellalternativ \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - använd en annan root för rpm installation.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"Media \"%s\" använder en ogiltig listfil:\n"
-"  spegeln är antagligen inaktuell, försök använda en alternativ metod"
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
+"                   vid (av)installation av chroot med --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "kan inte komma åt det första installationsmediat"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - utförligt läge.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtuell media måste vara lokal"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - välj alla paket som matchar uttryck.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "fel vid registrering av lokala paket"
+msgid "unknown packages"
+msgstr "okända paket"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - begränsa nedladdningshastigheten.\n"
+msgid "unknown package"
+msgstr "okänt paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "hittat undersökt hdlist (eller synthesis) som %s"
+msgid "removing package %s will break your system"
+msgstr "att ta bort paketet %s skulle förstöra systemet"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "hämtning av käll-hdlist (eller synthesis) misslyckades"
+msgid "Nothing to remove"
+msgstr "Ingenting att ta bort"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "inga RPM-filer hittade från [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Kontrollerar för att ta bort följande paket"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ingenting skrivet i listfilen för \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Följande paket har felaktiga signaturer"
+msgid " (y/N) "
+msgstr " (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "Beräknar MD5-summa för existerande hdlist- (eller synthesis) källa"
+msgid "removing %s"
+msgstr "tar bort %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "Removing failed"
+msgstr "Borttagning misslyckades"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  -c             - fullständig utmatning med paketet som ska tas bort.\n"
+"urpmf version %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"användning:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "kan inte installera paket %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - använd endast uppdateringsmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media         - använd endast givet media, separerat med komma.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia         - använd inte givet media, separerat med komma.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - tillåter användaren att installera paket utan\n"
-"                   kontroll av beroenden och integritet.\n"
+"  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Spara fil"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose             - utförligt läge.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "kan inte skriva inställningsfil [%s]"
+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 taggnamnet (standard om ingen tagg ges på "
+"kommando-\n"
+"                   raden, ej kompatibelt med interaktivt läge).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - välj alla paket som matchar uttryck.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - visa inte identiska rader.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ogiltigt nyckel-id (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - visa alla taggar.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - tvinga användning även om vissa paket inte finns.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - visa taggen \"group\": grupp.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - visa taggen \"size\": storlek.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - försök hitta och använda synthesis fil.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - visa taggen \"epoch\": epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - visa taggen \"summary\": sammanfattning.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - tvinga uppdatering av gpg-nyckel.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - visa taggen \"description\": beskrivning.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relativ sökväg till hdlist> saknas\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - visa taggen \"sourcerpm\": käll-RPM.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kontrollerar för att ta bort följande paket"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - visa taggen \"packager\": paketerare.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "obegärd"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - visa taggen \"buildhost\": byggdator.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "kan inte läsa rpm-fil [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url         - visa taggen \"url\": url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - visa taggen \"files\": alla filer.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides      - visa taggen \"provides\": allt som tillhandahålls.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "kan inte tyda \"%s\" i fil [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - visa taggen \"requires\": allt som krävs.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Vill du fortsätta installationen?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - visa taggen \"files\": alla filer.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "kunde inte läsa RPM-fil [%s] från media \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - visa taggen \"conflicts\": alla konflikter.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - visa taggen \"obsoletes\": alla inaktuella.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
-"distributionsträd, användbart\n"
-"                   vid installation av chroot med --root option.\n"
+"  --env          - använd specifik miljö (vanligen en\n"
+"                 felrapport).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "bygg dhlist synthesis fil för media \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - versaler och gemener jämförs lika i varje mönster.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - visa användbar information i en för människan läsbar "
-"form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - använd specificerad distributionsversion, förvalet\n"
-"                   hämtas från distributionens version som talas om av\n"
-"                   det installerade paketet mandrake-release.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - använd specificerad url för en lista av speglingar, "
-"standard är\n"
-"                   %s\n"
+"  -a             - binär AND operator, sant om båda uttrycken är sanna.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
-"distributionsträd, användbart\n"
-"                   vid (av)installation av chroot med --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr "  -o             - binär OR operator, sant om ett uttryck är sant.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unär NOT, sant om uttycket är falskt.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - vänster parentes för att öppna grupputtryck.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - höger parentes för att stänga grupputtryck.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
-"radera den"
+"återanrop är:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "avmonterar %s"
+msgid "using specific environment on %s\n"
+msgstr "använder specifik miljö på %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% klart, hastighet=%s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright © 1999, 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"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "startar om urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "undersöker synthesis-fil [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Försöka ännu hårdare att installera (--force)? (j/N)"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
+"installationen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopiering misslyckades"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - behåll om möjligt existerande paket, ignorera "
+"efterfrågade \n"
+"                   paket som leder till avinstalleringar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "kunde inte komma åt hdlist-fil för \"%s\", media ignorerat"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  -dela upp i små transaktioner om fler än angivna paket\n"
+"                   kommer att installeras eller uppdateras,\n"
+"                   förvalt alternativ är %d\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tyst läge.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
+"  --split-length - liten transaktionslängd, förvalt alternativ är %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - utförligt läge.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - kräv luddig sökning (samma som -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - nästa paket är ett källpaket (samma som -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - packa upp huvuden för paket från urpmi-db till\n"
-"                   standard ut (endast root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - installera endast källpaket (inga binärer).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "okända paket"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean      - ta bort rpm från cache före allt annat.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "väljer flera media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - behåll rpm som inte används i cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - tillåter användaren installera paket utan\n"
+"                   att kontrollera beroenden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "filen [%s] används redan i samma media \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - tillåter användaren att installera paket utan\n"
+"                   kontroll av beroenden och integritet.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "inget att ta bort (använd urpmi.addmedia för att lägga till media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
+"                   vid installation av chroot med --root option.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "kunde inte hitta listfil för \"%s\", media ignorerat"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - visar det här hjälpmeddelandet.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "hittade parallella hanterare för noder: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - begränsa nedladdningshastigheten.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"återanrop är:\n"
-"%s\n"
+"  --resume       - återuppta nedladdning av delvis nedladdade filer\n"
+"                   (--no-resume inaktiverar det, standard är inaktiverat).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - omvänd sökning för vad som krävs av paket.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - använd specificerad HTTP-proxy, portnumret antas\n"
+"                   vara 1080 som standard (formatet är <proxydator[:port]"
+">).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf version %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"användning:\n"
+"  --proxy-user   - ange användare och lösenord för proxy-\n"
+"                   autentisering (formatet är <användare:lösenord>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - visa inte taggnamnet (standard om ingen tagg ges på "
-"kommando-\n"
-"                   raden, ej kompatibelt med interaktivt läge).\n"
+"  --bug          - mata ut en felrapport i katalogen som indikeras av\n"
+"                nästa arg.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - visa inte identiska rader.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - använd X-gränssnitt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
-"update eller --parallel"
+"  --best-output  - välj det bästa gränssnittet enligt miljön:\n"
+"                   X eller textläge.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - använd specificerad arkitektur, förvalt är arkitekturen\n"
-"                   i installerat mandrake-release-paket.\n"
+"  --verify-rpm   - verifiera rpm-signatur före installation\n"
+"                     (--no-verify-rpm inaktiverar det, standard är "
+"aktiverat).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Är det OK?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - ignorera sökväg separerad av komma.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - exkludera dokumentfiler.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - använd given synthesis istället för urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - välj alla träffar på kommandoraden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "undersöker parallell hanterare i fil [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting att ta bort"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - kräv luddig sökning (samma som --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "läser huvuden från media \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - nästa paket är ett källpaket (samma som --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr ""
-"  -d             - utöka förfrågning till att omfatta paketberoenden.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tyst läge.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - mata ut en felrapport i katalogen som indikeras av\n"
-"                nästa arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  namn eller rpm-filer som anges på kommandoraden installeras.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "media \"%s\" definierar inte någon plats för RPM-filer"
+msgid "Choose location to save file"
+msgstr "Välj var filen ska sparas"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - visa taggen \"sourcerpm\": käll-RPM.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Vad kan göras med binära RPM-filer när -install-src används"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "kunde inte skriva listfil för \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Du har valt ett källpaket:\n"
+"\n"
+"%s\n"
+"\n"
+"Du vill troligen inte installera detta paket (efter installation kan du\n"
+"modifiera källkoden och sedan kompilera koden).\n"
+"\n"
+"Vad vill du göra?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - visa taggen \"requires\": allt som krävs.\n"
+msgid "Do nothing"
+msgstr "Gör ingenting"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "försöker välja media som inte finns \"%s\""
+msgid "Yes, really install it"
+msgstr "Ja, installera paketet"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - visa taggen \"description\": beskrivning.\n"
+msgid "Save file"
+msgstr "Spara fil"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "Kopiering misslyckades"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Du är på väg att installera följande paket på din dator:\n"
+"\n"
+"%s\n"
+"\n"
+"Kanske föredrar du att endast spara detta. Vilket är ditt val?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - tvinga generering av hdlist-filer.\n"
+msgid "Install it"
+msgstr "Installera det"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes kan endast användas med --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
+"radera den"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ingen hdlist-fil hittad för media \"%s\""
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Kunde inte skapa katalog [%s] för felrapport"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - nästa paket är ett källpaket (samma som --src).\n"
+msgid "Copying failed"
+msgstr "Kopiering misslyckades"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "installerar %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "Endast systemadministratörer får installera paket"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "läser RPM-filer från [%s]"
+msgid "One of the following packages is needed:"
+msgstr "Ett av följande paket är nödvändigt:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kopierar beskrivningsfil för \"%s\"..."
+msgid "What is your choice? (1-%d) "
+msgstr "Vad är ditt val? ( 1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - välj automatiskt ett paket från valen.\n"
+msgid "Package installation..."
+msgstr "Paketinstallation..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "Borttagning misslyckades"
+msgid "Initializing..."
+msgstr "Initierar..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --virtual      - skapa virtuellt media som alltid är uppdaterat, endast\n"
-"                   fil://-protokoll är tillåtet.\n"
+"Vissa begärda paket kan inte installeras:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "paketet %s hittas inte."
+msgid "do you agree ?"
+msgstr "accepterar du?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "tar bort media \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Installationen kan inte fortsätta eftersom följande paket måste\n"
+"tas bort så att andra kan uppdateras:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "behöver inte ange <relativ sökväg till hdlist> med --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Följande paket måste tas bort för att andra ska bli uppdaterade:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att installeras (%d "
+"MB)"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "Avbryt"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Du måste vara root för att kunna installera följande beroenden:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - nästa paket är ett källpaket (samma som -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "kunde inte läsa källan, avbryter"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - använd specifik miljö (vanligen en\n"
-"                 felrapport).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
+msgid "Press Enter when ready..."
+msgstr "Tryck \"Enter\" vid klart..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "kunde inte komma åt media \"%s\""
+msgid "Downloading package `%s'..."
+msgstr "Laddar ner paket \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "kunde inte skapa media \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% av %s klart ETA=%s, hastighet=%s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - visa taggen \"packager\": paketerare.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% klart, hastighet=%s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
+msgid "The following packages have bad signatures"
+msgstr "Följande paket har felaktiga signaturer"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Vill du fortsätta installationen?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Du måste vara root för att kunna installera följande beroenden:\n"
+"Installationen misslyckades, vissa filer saknas:\n"
 "%s\n"
+"Du bör försöka uppdatera urpmi-databasen."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - skriv ut ändringsloggen (changelog).\n"
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "kunde inte komma åt listfil för \"%s\", media ignorerat"
+msgid "distributing %s"
+msgstr "distribuerar %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - höger parentes för att stänga grupputtryck.\n"
+msgid "installing %s"
+msgstr "installerar %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "ingen 'webfetch' hittad, supportad webfetch är: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "undersöker hdlist-fil [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kopierar hdlist-fil..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Försöka ännu hårdare att installera (--force)? (j/N)"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "skriver listfil för media \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d installationstransaktioner misslyckades"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "virtuellt media \"%s\" bör ha en tydlig URL, media ignorerat"
+msgid "Installation is possible"
+msgstr "Installation är möjlig"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - visa taggen \"buildhost\": byggdator.\n"
+msgid "Everything already installed"
+msgstr "allt är redan installerat"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Gör ingenting"
+msgid "restarting urpmi"
+msgstr "startar om urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"användning: urpmi.addmedia [flaggor] <namn> <webbadress (url)> [with "
+"<relativ_sökväg>]\n"
+"där <webbadress> är en av\n"
+"       file://<sökväg>\n"
+"       ftp://<användarnamn>:<lösenord>@<värddator>/<sökväg> with <relativt "
+"filnamn till hdlist>\n"
+"       ftp://<värddator>/<sökväg> with <relativt filnamn till hdlist>\n"
+"       http://<värddator>/<sökväg> with <relativt filnamn till hdlist>\n"
+"       removable://<sökväg>\n"
+"\n"
+"och [flaggor] är från\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "använder associerad media för parallelläge: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - skapa ett uppdateringsmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "monterar %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - försök hitta och använda synthesis fil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"kan ej använda media \"%s\" eftersom listfilen redan används av ett annat "
-"media"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - försök att hitta och använda hdlist-fil.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "kunde inte läsa källan, avbryter"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - försök ej hitta någon synthesis- eller\n"
+"                   hdlist-fil.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - använd en annan root för rpm installation.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - skapa automatiskt all media från ett\n"
+"                 installationsmedia.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% av %s klart ETA=%s, hastighet=%s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - skapa automatiskt ett media för XXX-delen av en\n"
+"                   distribution, XXX kan vara huvuddelen, \"contrib\", "
+"uppdateringar eller\n"
+"                   någonting annat som har blivit inställt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "beräknar MD5-summa för hämtade hdlist- (eller syntheses) källor"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - använd specificerad url för en lista av speglingar, "
+"standard är\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - använd specificerad distributionsversion, förvalet\n"
+"                   hämtas från distributionens version som talas om av\n"
+"                   det installerade paketet mandrake-release.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
-"installationen.\n"
+"  --arch         - använd specificerad arkitektur, förvalt är arkitekturen\n"
+"                   i installerat mandrake-release-paket.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
+"  --virtual      - skapa virtuellt media som alltid är uppdaterat, endast\n"
+"                   fil://-protokoll är tillåtet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    -inaktivera md5sum-kontroll av filer.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - visa grupper med namn.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - rensa huvudcachekatalogen.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "mediat \"%s\" är inte valt"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - tvinga generering av hdlist-filer.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Endast systemadministratörer får installera paket"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "kan inte lägga till uppdateringar från en cooker-distribution\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "använder specifik miljö på %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "hämtar speglar på %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "kunde inte hitta hdlist-fil för \"%s\", media ignorerat"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "behöver inte ange <relativ sökväg till hdlist> med --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
-"  --split-length - liten transaktionslängd, förvalt alternativ är %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "kunde ej uppdatera media \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - vänster parentes för att öppna grupputtryck.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relativ sökväg till hdlist> saknas\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "för många monteringspunkter för flyttbar media \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "\"with\" saknas för nätverksmedia\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binär AND operator, sant om båda uttrycken är sanna.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "kunde inte skapa media \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"Kan inte läsa media \"%s\",\n"
-"detta kan hända om du manuellt monterade katalogen när du skapade detta "
-"media."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - visa taggen \"group\": grupp.\n"
+"användning: urpmi.removemedia [-a] <namn>...\n"
+"där <namn> är medianamnet som ska tas bort.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media         - använd endast givet media, separerat med komma.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - välj all media.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "kunde inte skapa transaktion"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"okända flaggor \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "hämtar RPM-filer från media \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "inget att ta bort (använd urpmi.addmedia för att lägga till media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Du har valt ett källpaket:\n"
-"\n"
-"%s\n"
-"\n"
-"Du vill troligen inte installera detta paket (efter installation kan du\n"
-"modifiera källkoden och sedan kompilera koden).\n"
-"\n"
-"Vad vill du göra?"
+"objektet som ska tas bort saknas\n"
+"(en av %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "distribuerar %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"användning: urpmi.update [flaggor] <namn>...\n"
+"där <namn> är medianamnet som ska uppdateras.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - uppdatera endast uppdateringsmedia.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "skriv inställningsfil [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - tvinga uppdatering av gpg-nyckel.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - välj all icke-flyttbar media.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - visa taggen \"epoch\": epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifiera rpm-signatur före installation\n"
-"                     (--no-verify-rpm inaktiverar det, standard är "
-"aktiverat).\n"
+"objektet som ska uppdateras saknas\n"
+"(en av %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright © 2002 MandrakeSoft.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"användning:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - visa tillgängliga paket.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   -   visa tillgänglig media.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - lista tillgänglig media och dess sökväg.\n"
 
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - kräv luddig sökning (samma som --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:56
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "ogiltig hdlist-beskrivning \"%s\" i hdlist-fil"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - visa tillgängliga noder vid användning av --parallel.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "tar bort %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - lista tillgängliga parallellalias.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - skapa automatiskt ett media för XXX-delen av en\n"
-"                   distribution, XXX kan vara huvuddelen, \"contrib\", "
-"uppdateringar eller\n"
-"                   någonting annat som har blivit inställt.\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - visa taggen \"size\": storlek.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "för att behålla %s"
+"  --headers      - packa upp huvuden för paket från urpmi-db till\n"
+"                   standard ut (endast root).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "på grund av otillräckliga %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Automatisk installation av paket.\n"
-"Du begärde installation av paketet %s\n"
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd.\n"
+"                   Detta tillåter kontroll av distribution.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi-databas låst"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - skriv ut ändringsloggen (changelog).\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
-"  --resume       - återuppta nedladdning av delvis nedladdade filer\n"
-"                   (--no-resume inaktiverar det, standard är inaktiverat).\n"
+"  -d             - utöka förfrågning till att omfatta paketberoenden.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - ta bort paket om en nyare version redan är installerad.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    -inaktivera md5sum-kontroll av filer.\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr ""
+"  -c             - fullständig utmatning med paketet som ska tas bort.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "tar flyttbar enhet som \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - omvänd sökning för vad som krävs av paket.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
-"Du är på väg att installera följande paket på din dator:\n"
-"\n"
-"%s\n"
-"\n"
-"Kanske föredrar du att endast spara detta. Vilket är ditt val?"
+"  -i             - visa användbar information i en för människan läsbar "
+"form.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - kräv luddig sökning (samma som -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - visa grupper med namn.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - ta bort paket om en nyare version redan är installerad.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - visa version och utgåva med namn.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - försök att hitta och använda hdlist-fil.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - lista filerna i paketet.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "för att %s saknas"
+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"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - använd endast uppdateringsmedia.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes kan endast användas med --parallel"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"användning: urpmi.update [flaggor] <namn>...\n"
-"där <namn> är medianamnet som ska uppdateras.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "försöker gå förbi befintligt media \"%s\", undviker"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - verifiera om installationen kan utföras korrekt.\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ 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:"
+
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Okänd webbhämtare \"%s\".\n"
diff --git a/po/tg.po b/po/tg.po
index c50a9618..8b195fe0 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-03-28 00:04+0500\n"
 "Last-Translator: Tolib Marupov <tolibm@yahoo.com> \n"
 "Language-Team:  Tajik\n"
@@ -40,2020 +40,2066 @@ msgstr "ҲҳYy"
 msgid "Nn"
 msgstr "НнNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "коргузории %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --disrtib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
-"манбаъҳоро                    созед.\n"
+"Коргузориши автоматикии қуттиҳо...\n"
+"Шумо коргузориши куттии '%s'-ро талаб кардед\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "кушодани rpmdb номумкин"
+msgid "Is this OK?"
+msgstr "Ин дуруст аст?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Яке аз қуттиҳои зерин барои коргузории %s лозим аст:"
+msgid "Cancel"
+msgstr "Бекор кардан"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "хориҷкунии қуттии %s"
+msgid " (Y/n) "
+msgstr " (Ҳ/н) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: фармон ёфта нашуд\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Усули параметрҳоро бо усули use-distrib якҷоя истифода бурда намешавад"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"истифодабари: %s [хосиятҳо]\n"
+"аз куҷо [хосиятҳо]\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - чопи ин пайғоми ёрӣ.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - маҳдудкунии натиҷа ё гурӯҳи додашуда.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "раванди %d -ро барои иҷроиши амалиёт истифода баред"
+msgid "                    defaults is %s.\n"
+msgstr "                    бо нобаёнӣ %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
-"пешниҳодшаванда.\n"
+msgid "unknown protocol defined for %s"
+msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Интихоби шумо чист? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d сарлавҳаҳо дар кэш ёфт шуданд"
+msgid "unable to handle protocol: %s"
+msgstr "даста кардани қарордод номумкин: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "қуттиҳои зиёде бо чунин номи файли rpm \"%s\" вуҷуд доранд"
+msgid "syntax error in config file at line %s"
+msgstr "хатогии таркибӣ дар сатри %s дар файли танзимдарор"
+
+#: ../urpm.pm:174
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"миёнаи \"%s\" кӯшиши истифодаи hdlist-и аллакай истифодашуда дорад, миёна "
+"рад шуд"
+
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"миёнаи \"%s\" кӯшиши истифодаи рӯйхати аллакай истифодашуда дорад, миёна рад "
+"шуд"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - корванд ва гузарвожаро барои авторизацияи proxy нишон "
-"диҳед\n"
-"                   (шакли <корванд:гузарвожа>).\n"
+"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
+"дигар истифода шудааст"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "роҳи дуюми ҳисоби вобастагиҳо ба амал оварда мешавад\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"истифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай истифода "
+"шудааст"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "барқароркунии файли rpm [%s] ..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"гирифтани муҳити \"%s\" ба ҳисобот аз барои вуҷуд надоштани рӯйхати файли [%"
+"s] номумкин"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "муайян кардани муҳити ин файли hdlist-и [%s] номумкин"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...барқароркунӣ нагузашт: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr ""
-"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
+
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"  -o             - амалгари дуӣ OR, true-ро бармегардонад, агар "
-"яке                    аз ифодаҳо true бошад.\n"
+"сарчашмаи маҷозӣ \"%s\"на бояд файли муайяни hdlist ё файли рӯйхатиродошта "
+"бошад, сарчашма ба эътибор гирифта намешавад"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Package installation..."
-msgstr "барномаи коромода насб мегардад..."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"сарчашмаи маҷозӣ \"%s\" бояд url-и холӣ дошта бошад, сарчашма эътиборнадорад"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "номи файли rpm-и нодурусти [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d коргузорӣ амалӣ нагардид"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "файли рӯйхати бемуносибат барои \"%s\", муҳит рад шуд"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
-"дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли Mandrake/base/hdlists "
-"ёфт нашуд)"
+"аз назар гузаронидани файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "нуқтаи васлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Choose location to save file"
-msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
+msgid "taking removable device as \"%s\""
+msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "истифодаи дигар дастгоҳи хориҷшавандаи [%s] барои \"%s\""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуттиҳои зерин соҳиби %s: %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Install it"
-msgstr "Онро коргузорӣ кунед"
+msgid "unable to write config file [%s]"
+msgstr "навиштани файли танзимдарории [%s] номумкин"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - интерфейси X истифода баред.\n"
+msgid "write config file [%s]"
+msgstr "файли танзимдарории [%s] нависед"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Яке аз қуттиҳои зерин даркор аст:"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Усули параметрҳоро бо усули use-distrib якҷоя истифода бурда намешавад"
 
-#: ../urpme:1
+#: ../urpm.pm:412
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - мувофиқи давра интерфейси беҳтаринро бояд интихоб кард:\n"
-"                   Х ё ин ки намуди матнӣ.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "санҷидани дастгузори параллел дар файли [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Фаровири қуттии `%s'..."
+msgid "found parallel handler for nodes: %s"
+msgstr "дастгузори параллел ёфт шуд барои гиреҳҳо: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Ҳангоми истифодаи --install-src чӣ бояд кард бо файлҳои дуии rpm"
+msgid "using associated media for parallel mode: %s"
+msgstr "барои навъи параллелӣ расонаи вобасташуда истифода мешавад: %s"
+
+#: ../urpm.pm:441
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "истифодабарии хосияти параллели \"%s\" номумкуин"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - барои аз нав намудани систем барномаҳои "
-"коромодаробеихтиёрона интихоб намуд.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "--synthesis бо --media, --update ё --parallel истифода бурда намешавад"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "no package named %s"
-msgstr "қуттии бо номи %s нест"
+msgid "examining synthesis file [%s]"
+msgstr "санҷидани файли synthesis [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr ""
-"  -a             - ҳамаи мувофиқатҳоро аз сатри фармонӣ интихоб намоед.\n"
+msgid "examining hdlist file [%s]"
+msgstr "санҷидани файли hdlist [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
-"коргузорӣ ба амал наомад, якчанд файлҳо мавҷуд нестанд:\n"
-"%s\n"
-"Мумкин шумо додаҳои urpmi-ро нав мекунед"
+"сарчашмаи маҷозӣ \"%s\"маҳаллӣ нест, сарчашма ба эътибор гирифта намешавад"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"истифода: urpmi.removemedia [-a] <ном> ...\n"
-"дар куҷо <ном> ин номи муҳит барои хориҷ кардан.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "муаммои хондани файли hdlist ё файли сарчашмаи synthesis \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Азбаски қуттиҳои зерин барои аз нав намудани боқимондаҳояш хориҷ бояд\n"
-"кард, онгоҳ коргузориро давом додан мумкин нест\n"
-"%s\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "роҳи дуюми ҳисоби вобастагиҳо ба амал оварда мешавад\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:563
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' барои сарчашмаи шабакагӣ вуҷуд надорад\n"
+msgid "skipping package %s"
+msgstr "қуттӣ парофта мешавад %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:572
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
+msgid "would install instead of upgrade package %s"
+msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ амалӣ хоҳад шуд %s"
 
-#: ../urpme:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unknown package"
-msgstr "қуттии номаълум"
+msgid "unable to open rpmdb"
+msgstr "кушодани rpmdb номумкин"
 
-#: ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid "Installation is possible"
-msgstr "Коргузорӣ мумкин аст"
+msgid "medium \"%s\" already exists"
+msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
 
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
-"%s\n"
-"Шумо розӣ ҳастед?"
+msgid "virtual medium need to be local"
+msgstr "сарчашмаи маҷозӣ бояд маҳаллӣ бошад"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpm.pm:661
+#, c-format
+msgid "added medium %s"
+msgstr "миёнаи иловашуда %s"
+
+#: ../urpm.pm:677
+#, c-format
+msgid "unable to access first installation medium"
+msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
+
+#: ../urpm.pm:681
+#, c-format
+msgid "copying hdlists file..."
+msgstr "нусхабардории файли hdlists..."
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
+#, c-format
+msgid "...copying failed"
+msgstr "...нусхабардорӣ нагузашт"
+
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
+#, c-format
+msgid "...copying done"
+msgstr "...нусхабардорӣ шуд"
+
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
 msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
+"дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли Mandrake/base/hdlists "
+"ёфт нашуд)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"гирифтани муҳити \"%s\" ба ҳисобот аз барои вуҷуд надоштани рӯйхати файли [%"
-"s] номумкин"
+msgid "retrieving hdlists file..."
+msgstr "барқароркунии файли hdlists..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Н) "
+msgid "...retrieving done"
+msgstr "...барқароркунӣ шуд"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "ба cooker-и тақсимотӣ навоварӣ дароварда намешавад\n"
+msgid "...retrieving failed: %s"
+msgstr "...барқароркунӣ нагузашт: %s"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:720
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - намуди муфассал.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "invalid hdlist description \"%s\" in hdlists file"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid "Initializing..."
-msgstr "Коргузорӣ намудан..."
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - рӯйхаткунии қуттиҳои дастрас.\n"
+msgid "selecting multiple media: %s"
+msgstr "интихобкунии миёнаи бисёр: %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - чопи ҳама тэгҳо.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "removing medium \"%s\""
+msgstr "хориҷкунии миёнаи \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
+"роҳ ба сарчашма нест \"%s\",\n"
+"ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати сохтанисарчашма "
+"ба амал меояд."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr ""
-"сарчашмаи маҷозӣ \"%s\"на бояд файли муайяни hdlist ё файли рӯйхатиродошта "
-"бошад, сарчашма ба эътибор гирифта намешавад"
+"сарчашмаи маҷозии\"%s\" бояд hdlist-и аввали дурустро дошт бошад ё ин "
+"киsynthesis, сарчашма эътибор надорад"
+
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "нусхабардории файли тавсифоти \"%s\"..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "ҳисоби md5sum-и сарчашмаи вуҷуд доштаи hdlist (ё ин ки synthesis)"
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "санҷидани файли MD5SUM"
+
+#: ../urpm.pm:1092
+#, c-format
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "нусхабардории сарчашмаи hdlist (ё synthesis)-и \"%s\"..."
+
+#: ../urpm.pm:1105
+#, c-format
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 "hdlist (ё ин ки synthesis) аввали нусха гирифташуда ҳисоб мешавад md5sum"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - роҳҳое ки бо вергул ишора шудаанд, хориҷ намоед.\n"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1174
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"интихоби номуаяйн '%s'\n"
+msgid "reading rpm files from [%s]"
+msgstr "хониши файлҳои rpm аз [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - ба тарокуниши хурд тақсим намоед, агар\n"
-"                   додоҳои иловагӣ ба ғайр аз ишорашуда муқаррар ё нав "
-"гардад                   \n"
-"                   нобаён %d мебошад.\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "хондани файли rpm номумкин аз [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "муаммои хондани файли hdlist ё файли сарчашмаи synthesis \"%s\""
+msgid "no rpm files found from [%s]"
+msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget          - барои гирифтани файлҳои хориҷшуда wget-ро истифода "
-"баред.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
-"  -p             - ба ҷустуҷӯӣ дар provides иҷозат диҳед барои дастрас "
-"намуданибарномаҳои коромода.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"  --list-nodes   - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
+"аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "офариниши hdlist [%s]"
+msgid "md5sum mismatch"
+msgstr "мувофиқ набудан ба md5sum"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1483
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-" --keep         - аз имконият истифода бурда барномаҳои коромодаро нигоҳ "
-"доред, хориҷ намоед\n"
-"                   барномаҳои коромодаҳое ки ба хориҷшавӣ меоранд.\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "hdlist (ё synthesis)-и аввала ба даст оварда нашуд"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "санҷидани файли MD5SUM"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../_irpm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: фармон ёфта нашуд\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "файли [%s] дар сарчашмаи монанд аллакай истифода мешавад \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "unable to register rpm file"
-msgstr "бақайдгирии файли rpm номумкин"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
 
-#: ../urpmi:1
+#: ../urpm.pm:1579
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - корвандро пурсида имконият медиҳад, то ки\n"
-"                   барномаҳои коромодаро бе тафтиши вобастагиҳо муаяйн "
-"намояд.\n"
+msgid "unable to write list file of \"%s\""
+msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "даста кардани қарордод номумкин: %s"
+msgid "writing list file for medium \"%s\""
+msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "барқароркунии файли hdlists..."
+msgid "nothing written in list file for \"%s\""
+msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
 
-#: ../urpmi:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "Yes, really install it"
-msgstr "Бале, дар ҳақиқат онро коргузорӣ кунед"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "added medium %s"
-msgstr "миёнаи иловашуда %s"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...калиди гирифта шуда %s  аз файли калиди кушода \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr ""
-"  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "тарокуниш барои коргузорӣ дар %s (remove=%d, install=%d, upgrade=%d)"
+msgid "reading headers from medium \"%s\""
+msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "md5sum mismatch"
-msgstr "мувофиқ набудан ба md5sum"
+msgid "building hdlist [%s]"
+msgstr "офариниши hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "хатогии таркибӣ дар сатри %s дар файли танзимдарор"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  номҳо ё файлҳое ки дар сатри фармони ишора шуда коргузорӣ хоҳанд шуд.\n"
+msgid "found %d headers in cache"
+msgstr "%d сарлавҳаҳо дар кэш ёфт шуданд"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1749
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  HTTP-проксии муайянро аз рӯи ноаёнӣ истифода баред\n"
-"                    даргоҳи 1080 истифода мешавад (шакли <proxyhost[:port]"
-">).\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "хориҷи сарлавҳаҳои кӯҳнашудаи %d дар кэш"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "in order to install %s"
-msgstr "барои коргузоштани %s"
+msgid "mounting %s"
+msgstr "васлкунии %s"
+
+#: ../urpm.pm:1906
+#, c-format
+msgid "unmounting %s"
+msgstr "ҷудокунии %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "элементҳои %s-и ҷойивазшуда дар depslist"
 
-#: ../urpmf:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
+msgid "no entries relocated in depslist"
+msgstr "ягон элемент ба depslist ҷойиваз нашуд"
 
-#: ../urpmi:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
+msgid "invalid rpm file name [%s]"
+msgstr "номи файли rpm-и нодурусти [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ амалӣ хоҳад шуд %s"
+msgid "retrieving rpm file [%s] ..."
+msgstr "барқароркунии файли rpm [%s] ..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "барқароркунии оинаҳо дар %s ..."
+msgid "unable to access rpm file [%s]"
+msgstr "дохилшавии файли rpm-и [%s] номумкин"
 
-#: ../urpmf:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - чоп намоед тэг url: url.\n"
+msgid "unable to register rpm file"
+msgstr "бақайдгирии файли rpm номумкин"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "барои %s протоколи номуаяйн муқаррар шудааст"
+msgid "error registering local packages"
+msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
 
-#: ../urpmq:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - чопи нашр ва нусха ҳамчун бо ном.\n"
+msgid "no package named %s"
+msgstr "қуттии бо номи %s нест"
 
-#: ../urpmf:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Қуттиҳои зерин соҳиби %s: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "қуттиҳои зиёде бо чунин номи файли rpm \"%s\" вуҷуд доранд"
 
-#: ../_irpm:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "installing %s\n"
-msgstr "коргузории %s\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"элемент барои нав кардан ҳозир нест\n"
-"(яке аз %s)\n"
+"сарчашмаи \"%s\" рӯйхати файли нодурустро истифода мебарад:\n"
+"  мумкин оина кӯҳна шудааст, барои истифодаи усули дигар кӯшиш намоед"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "trying to promote %s"
-msgstr "кӯшиши фаъол намудан %s"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "сарчашмаи \"%s\" ҷойгиршавии файлҳои rpm-ро муаяйн намекунад"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "unable to remove package %s"
-msgstr "хориҷи қуттии %s номумкин"
+msgid "package %s is not found."
+msgstr "қуттии %s ёфт нашуд."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
+msgid "urpmi database locked"
+msgstr "urpmi манбаи маълумот дастнорас аст"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"элемент барои хориҷ кардан ҳозир нест\n"
-"(яке аз %s)\n"
+msgid "medium \"%s\" is not selected"
+msgstr "муҳити \"%s\" интихоб нашудааст"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - интихоби ҳама муҳит.\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Имзо мавҷуд нест (%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "хондани файли rpm номумкин аз [%s]: %s"
+msgid "unable to access medium \"%s\""
+msgstr "дохилшавии муҳити \"%s\" номумкин"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
+msgid "malformed input: [%s]"
+msgstr "даровардани бад: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
+msgid "Preparing..."
+msgstr "Тайёрӣ..."
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2752
 #, c-format
-msgid " (Y/n) "
-msgstr " (Ҳ/н) "
+msgid "using process %d for executing transaction"
+msgstr "раванди %d -ро барои иҷроиши амалиёт истифода баред"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - маҳдудкунии натиҷа ё гурӯҳи додашуда.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "тарокуниш барои коргузорӣ дар %s (remove=%d, install=%d, upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"миёнаи \"%s\" кӯшиши истифодаи рӯйхати аллакай истифодашуда дорад, миёна рад "
-"шуд"
+msgid "unable to create transaction"
+msgstr "офаридани муҳит номумкин аст"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "даровардани бад: [%s]"
+msgid "removing package %s"
+msgstr "хориҷкунии қуттии %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing package %s will break your system"
-msgstr ""
-"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
+msgid "unable to remove package %s"
+msgstr "хориҷи қуттии %s номумкин"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "иловаи барномаи коромода %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
-"%s"
+msgid "unable to install package %s"
+msgstr "кор гузоштани қуттии %s номумкин"
 
-#: ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
+msgid "due to missing %s"
+msgstr "аз сабаби мавҷуд набудан %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ягон элемент ба depslist ҷойиваз нашуд"
+msgid "due to unsatisfied %s"
+msgstr "аз сабаби қонеъ набудан %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - барномаҳои коромодаро танҳо бо манбаи аввала "
-"коргузорӣнамоед\n"
-"                   (бе ҳисоби дуӣ).\n"
+msgid "trying to promote %s"
+msgstr "кӯшиши фаъол намудан %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - curl-ро барои гирифтани файлҳои хориҷшуда истифода "
-"намоед.\n"
+msgid "in order to keep %s"
+msgstr "барои нигоҳдории %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
+msgid "in order to install %s"
+msgstr "барои коргузоштани %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "do you agree ?"
-msgstr "шумо розӣ ҳастед ?"
+msgid "due to conflicts with %s"
+msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "файли рӯйхати бемуносибат барои \"%s\", муҳит рад шуд"
+msgid "unrequested"
+msgstr "хоҳиш нашуда"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "...retrieving done"
-msgstr "...барқароркунӣ шуд"
+msgid "Invalid signature (%s)"
+msgstr "Имзои нодуруст (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "иловаи барномаи коромода %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "Invalid Key ID (%s)"
+msgstr "Калиди нодуруст ID (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "skipping package %s"
-msgstr "қуттӣ парофта мешавад %s"
+msgid "Missing signature (%s)"
+msgstr "Имзо мавҷуд нест (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Имзои нодуруст (%s)"
+msgid "bad proxy declaration on command line\n"
+msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
 
-#: ../urpmq:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  номҳо ва ё файлҳои rpm дар сатри фармонӣ ишора шуда дархост мегарданд.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
 
-#: ../urpmi:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"urpmi version %s\n"
+"urpme version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"нашри urpmi %s\n"
+"нашри urpme %s\n"
 "Ҳуқуқи Муаллифӣ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
 "шавад.\n"
 "\n"
 "истифода:\n"
 
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
-" --excludemedia - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "муайян кардани муҳити ин файли hdlist-и [%s] номумкин"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "таҷзияи файли hdlist - и \"%s\" номумкин"
+" --auto         - ба таври автоматӣ барномаҳои коромодаро аз "
+"барномаҳоипешниҳодшуда интихоб намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"миёнаи \"%s\" кӯшиши истифодаи hdlist-и аллакай истифодашуда дорад, миёна "
-"рад шуд"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
+" --test         - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "хориҷи сарлавҳаҳои кӯҳнашудаи %d дар кэш"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force        - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
+"барномаҳои                   коромода вуҷуд надошта бошад.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "нав кардани муҳити \"%s\" номумкин\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
 
-#: ../urpmi:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"сарчашмаи маҷозӣ \"%s\"маҳаллӣ нест, сарчашма ба эътибор гирифта намешавад"
+"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
+"                   барои коргузорӣ (на)кардани chroot бо хосият --root "
+"фоиданок аст.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "Preparing..."
-msgstr "Тайёрӣ..."
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - намуди муфассал.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:50
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    бо нобаёнӣ %s.\n"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "истифодаи дигар дастгоҳи хориҷшавандаи [%s] барои \"%s\""
+msgid "unknown packages"
+msgstr "қуттиҳои номаълум"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:83
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-" --no-probe     - барои дарёфти  synthesis ё файли hdlist кӯшиш накунед.\n"
+msgid "unknown package"
+msgstr "қуттии номаълум"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:93
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "removing package %s will break your system"
 msgstr ""
-"  -P             - барои барномаи коромода provides-ро истифода набаред.\n"
+"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
+msgid "Nothing to remove"
+msgstr "Ҳеҷ чизро хориҷ карда намешавад"
 
-#: ../urpmq:1
+#: ../urpme:99
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - танзими urpmi дар ҳаркат аз дарахти distrib.\n"
-"                   Ин интихоб пурсиши тақсимотро иҷозат медиҳад.\n"
+msgid "Checking to remove the following packages"
+msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:106
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
-"истифодабари: %s [хосиятҳо]\n"
-"аз куҷо [хосиятҳо]\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
+"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"истифодаи номи \"%s\" барои муҳити беном номумкин, ин ном аллакай истифода "
-"шудааст"
+msgid " (y/N) "
+msgstr " (ҳ/Н) "
 
-#: ../urpmf:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr " --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
+msgid "removing %s"
+msgstr "хориҷи қуттии %s "
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"сарчашмаи маҷозии\"%s\" бояд hdlist-и аввали дурустро дошт бошад ё ин "
-"киsynthesis, сарчашма эътибор надорад"
+msgid "Removing failed"
+msgstr "Хориҷкунӣ нагузашт"
 
-#: ../urpme:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"нашри urpme %s\n"
-"Ҳуқуқи Муаллифӣ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"нашри urpmf %s\n"
+"Ҳуқуқи Муаллифӣ (C) 2002 MandrakeSoft.\n"
 "Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
 "шавад.\n"
 "\n"
 "истифода:\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"истифода: urpmi.addmedia [хосиятҳо] <ном> <url> [with <relative_path>]\n"
-"дар куҷо <url> яке аз\n"
-"       file://<роҳ>\n"
-"       ftp://<номи дохилӣ>:<гузарвожа>@<соҳиб>/<роҳ> бо <номи нисбии файли "
-"hdlist>\n"
-"       ftp://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
-"       http://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
-"       хориҷшаванда://<роҳ>\n"
-"\n"
-"ва [хосиятҳо] аз\n"
-
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "нусхабардории сарчашмаи hdlist (ё synthesis)-и \"%s\"..."
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "...copying done"
-msgstr "...нусхабардорӣ шуд"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "истифодабарии хосияти параллели \"%s\" номумкуин"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+" --excludemedia - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"сарчашмаи \"%s\" рӯйхати файли нодурустро истифода мебарад:\n"
-"  мумкин оина кӯҳна шудааст, барои истифодаи усули дигар кӯшиш намоед"
+"  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
+"банавъҳо ҷудо намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - synthesis-ро ба ҷои urpmi db истифода баред.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "сарчашмаи маҷозӣ бояд маҳаллӣ бошад"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ҳолати муфассал.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "error registering local packages"
-msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
+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"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmf:41
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - суръати қабулро маҳдуд намоед.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - чопи ҳама тэгҳо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "hdlist (ё synthesis)-и аввала ба даст оварда нашуд"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "дар файли рӯйхат барои \"%s\" чизе навишта нашудааст"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Қуттиҳои зерин имзоҳои бад доранд"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "ҳисоби md5sum-и сарчашмаи вуҷуд доштаи hdlist (ё ин ки synthesis)"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
 
-#: ../urpmq:1
+#: ../urpmf:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:49
 #, c-format
-msgid "unable to install package %s"
-msgstr "кор гузоштани қуттии %s номумкин"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
 
-#: ../urpmi:1
+#: ../urpmf:50
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - бо мақсади  насб намудани барномаи коромода бе тафтиши\n"
-"                   вобастагиҳо ва бутунӣ барои пурсиши корван иҷозат дода "
-"шавад.\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Save file"
-msgstr "Захиракунии файл"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - чоп намоед тэг url: url.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
+"пешниҳодшаванда.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "навиштани файли танзимдарории [%s] номумкин"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr " --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
 
-#: ../urpme:1
+#: ../urpmf:54
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - чопи tag files: ҳамаи файлҳо.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Калиди нодуруст ID (%s)"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr " --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:56
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
-" --force        - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
-"барномаҳои                   коромода вуҷуд надошта бошад.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
+"  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --probe-synthesis - кӯшиши ёфтан ва истифодаи файли synthesis-ро намоед.\n"
+"  --env          - муҳити махсусро истифода баред (одатан ҳисоботи\n"
+"                   хатогиҳо).\n"
 
-#: ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
-"намоед.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - зӯран навкунии gpg-калид.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<роҳи нисбии hdlist> ҳозир нест\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
 
-#: ../urpme:1
+#: ../urpmf:62
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr ""
+"  -a             - амалгари дучанда AND, ба true бар мегардад, агар ҳардуи\n"
+"                   ифодаҳо дуруст бошанд.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "unrequested"
-msgstr "хоҳиш нашуда"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
+"  -o             - амалгари дуӣ OR, true-ро бармегардонад, агар "
+"яке                    аз ифодаҳо true бошад.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:64
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "дохилшавии файли rpm-и [%s] номумкин"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - ягонӣ НЕ, рост агар ифода дурӯғ бошад.\n"
 
-#: ../urpmf:1
+#: ../urpmf:65
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - чопи tag files: ҳамаи файлҳо.\n"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - қавси чап барои кушодани ифодаи гурӯҳ.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:66
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "таҷзияи \"%s\" дар файли [%s] номумкин"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+"даъвати баръакс :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "хондани файли rpm [%s] аз муҳити \"%s\" номумкин"
+msgid "using specific environment on %s\n"
+msgstr "барои %s давраи махсус истифода мегардад\n"
 
-#: ../urpmi:1
+#: ../urpmf:150
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
-"                   барои коргузоркунии chroot бо хосият --root фоиданок "
-"аст.\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"нашри urpmi %s\n"
+"Ҳуқуқи Муаллифӣ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад.\n"
+"\n"
+"истифода:\n"
 
-#: ../urpmq:1
+#: ../urpmi:82
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
-"  -i             - ахбороти фоиданокро дар намуди барои хондан қуллай чоп "
-"кардан.\n"
+"  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
+"намоед.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
-" --version      - аз рӯи пешфарз намуди нишондодашудаи тақсимотро "
-"истифодабаред\n"
-"                   тафсири тақсимоте ки бо барномаи коромодаи mandrake-"
-"release\n"
-"                   муқаррар шудааст, истифода мегардад.\n"
+"  --auto-select  - барои аз нав намудани систем барномаҳои "
+"коромодаробеихтиёрона интихоб намуд.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  --from         - барои оинаҳои рӯйхати url-и додашуда истифода баред\n"
-"                   аз рӯи пешфарз истифода мешавад%s\n"
+"  --no-uninstall - барои хориҷи барномаи коромода ҳеҷ чизро пешниҳоднакунед, "
+"коргузориро қатъ накунед.\n"
 
-#: ../urpme:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
-"                   барои коргузорӣ (на)кардани chroot бо хосият --root "
-"фоиданок аст.\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - ягонӣ НЕ, рост агар ифода дурӯғ бошад.\n"
+" --keep         - аз имконият истифода бурда барномаҳои коромодаро нигоҳ "
+"доред, хориҷ намоед\n"
+"                   барномаҳои коромодаҳое ки ба хориҷшавӣ меоранд.\n"
 
-#: ../urpmi:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"Феҳристи [%s] аллакай мавҷуд аст, марҳамат карда дигар феҳристро барои "
-"маърӯзаи оиди хато, истифода баред ё онро нобуд созед"
+"  --split-level  - ба тарокуниши хурд тақсим намоед, агар\n"
+"                   додоҳои иловагӣ ба ғайр аз ишорашуда муқаррар ё нав "
+"гардад                   \n"
+"                   нобаён %d мебошад.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "unmounting %s"
-msgstr "ҷудокунии %s"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - дарозии тарокуниши хурд, пешфарз %d мебошад.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
-"ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% ба охир расид, суръат = %s"
-
-#: ../urpmi:1
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi бозоғоз шуда истодааст"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining synthesis file [%s]"
-msgstr "санҷидани файли synthesis [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
+"  --fuzzy        - дар асоси мантиқи нодуруст ба кофтукобӣ оғоз намоед(ба "
+"монандӣ -y).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "...copying failed"
-msgstr "...нусхабардорӣ нагузашт"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - қуттии оянда қуттии аввала аст (ба монандӣ -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
+"  --install-src  - барномаҳои коромодаро танҳо бо манбаи аввала "
+"коргузорӣнамоед\n"
+"                   (бе ҳисоби дуӣ).\n"
 
-#: ../urpmi:1
+#: ../urpmi:95
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - усули ором.\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - rpm-ро пеш аз ҳама аз пинҳонӣ хориҷ кунед.\n"
 
-#: ../urpmf:1
+#: ../urpmi:96
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ҳолати муфассал.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr ""
+"  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
 
-#: ../urpmq:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  --sources      - пеш аз қабули маълумоти лозима ҳамаи барномаҳои "
-"коромодарогиред\n"
-"                   (танҳо барои root).\n"
+"  --allow-nodeps - корвандро пурсида имконият медиҳад, то ки\n"
+"                   барномаҳои коромодаро бе тафтиши вобастагиҳо муаяйн "
+"намояд.\n"
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  --headers      - номгӯҳои барномаҳои коромодае ки дар urpmi db "
-"ифодашудааст гиред\n"
-"                   дар stdout (танҳо барои root).\n"
+"  --allow-force  - бо мақсади  насб намудани барномаи коромода бе тафтиши\n"
+"                   вобастагиҳо ва бутунӣ барои пурсиши корван иҷозат дода "
+"шавад.\n"
 
-#: ../urpme:1
+#: ../urpmi:104
 #, c-format
-msgid "unknown packages"
-msgstr "қуттиҳои номаълум"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
+"                   барои коргузоркунии chroot бо хосият --root фоиданок "
+"аст.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "интихобкунии миёнаи бисёр: %s"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget          - барои гирифтани файлҳои хориҷшуда wget-ро истифода "
+"баред.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
-"  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
+"  --curl         - curl-ро барои гирифтани файлҳои хориҷшуда истифода "
+"намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "файли [%s] дар сарчашмаи монанд аллакай истифода мешавад \"%s\""
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - суръати қабулро маҳдуд намоед.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:109
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"ба хориҷкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia истифода баред)\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
+"  --resume       - интиқоли файлҳои қисан боркардашударо идома медиҳад\n"
+"                   (--no-resume онро хомӯш мекунад, бо нобаёнӣ хомӯш карда "
+"мешавад).\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - чопи ин пайғоми ёрӣ.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  HTTP-проксии муайянро аз рӯи ноаёнӣ истифода баред\n"
+"                    даргоҳи 1080 истифода мешавад (шакли <proxyhost[:port]"
+">).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "дастгузори параллел ёфт шуд барои гиреҳҳо: %s"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - корванд ва гузарвожаро барои авторизацияи proxy нишон "
+"диҳед\n"
+"                   (шакли <корванд:гузарвожа>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"даъвати баръакс :\n"
-"%s\n"
+"  --bug          - ба феҳрист ҳисобот оиди хатогиҳо бароред\n"
+"                   бо далели зерин.\n"
 
-#: ../urpmq:1
+#: ../urpmi:119
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - интерфейси X истифода баред.\n"
 
-#: ../urpmf:1
+#: ../urpmi:120
 #, 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"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"нашри urpmf %s\n"
-"Ҳуқуқи Муаллифӣ (C) 2002 MandrakeSoft.\n"
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад.\n"
-"\n"
-"истифода:\n"
+"  --best-output  - мувофиқи давра интерфейси беҳтаринро бояд интихоб кард:\n"
+"                   Х ё ин ки намуди матнӣ.\n"
 
-#: ../urpmf:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --quiet        - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
-"набошад\n"
-"                   сатр, номувофиқ аст бо усули интерактивӣ).\n"
+"  --verify-rpm   - пеш аз коргузорӣ намудан имзоро тафтиш намоед \n"
+"                   (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
+"рӯипешфарз).\n"
 
-#: ../urpmf:1
+#: ../urpmi:125
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - роҳҳое ки бо вергул ишора шудаанд, хориҷ намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "--synthesis бо --media, --update ё --parallel истифода бурда намешавад"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - файлҳои ҳуҷҷатҳоро хориҷ намоед.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
-"  --arch         - санъати нишондода шударо аз рӯи пешфарз истифода баред\n"
-"                   санъати барномаи коромодаи муқарраршуда истифода мешавад\n"
-"                   mandrake-release.\n"
+"  -a             - ҳамаи мувофиқатҳоро аз сатри фармонӣ интихоб намоед.\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:128
 #, c-format
-msgid "Is this OK?"
-msgstr "Ин дуруст аст?"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr ""
+"  -p             - ба ҷустуҷӯӣ дар provides иҷозат диҳед барои дастрас "
+"намуданибарномаҳои коромода.\n"
 
-#: ../urpmi:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - файлҳои ҳуҷҷатҳоро хориҷ намоед.\n"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - барои барномаи коромода provides-ро истифода набаред.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - synthesis-ро ба ҷои urpmi db истифода баред.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "санҷидани дастгузори параллел дар файли [%s]"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
 
-#: ../urpme:1
+#: ../urpmi:132
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ҳеҷ чизро хориҷ карда намешавад"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - усули ором.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:134
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...калиди гирифта шуда %s  аз файли калиди кушода \"%s\""
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  номҳо ё файлҳое ки дар сатри фармони ишора шуда коргузорӣ хоҳанд шуд.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
+msgid "Choose location to save file"
+msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
 
-#: ../urpmq:1
+#: ../urpmi:197
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - дархости васеъ ба тобеиятҳои қуттӣ.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Ҳангоми истифодаи --install-src чӣ бояд кард бо файлҳои дуии rpm"
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"  --bug          - ба феҳрист ҳисобот оиди хатогиҳо бароред\n"
-"                   бо далели зерин.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "сарчашмаи \"%s\" ҷойгиршавии файлҳои rpm-ро муаяйн намекунад"
+"Шумо бастаи барномаҳои сарчашмавиро интихоб кардед:\n"
+"\n"
+"%s\n"
+"\n"
+"Эҳтимолан зарурати коргузории он дар мошинаи шумо нест\n"
+"(коргузории он ба шумо имконияти воридкунии тағиротҳо ба рамзи мабдаъ ва "
+"баъд онро ҳамгардон кунед).\n"
+"\n"
+"Шумо чи кор кардан мехоҳед?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
+msgid "Do nothing"
+msgstr "Ҳеҷ кор накунед"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
+msgid "Yes, really install it"
+msgstr "Бале, дар ҳақиқат онро коргузорӣ кунед"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr " --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
+msgid "Save file"
+msgstr "Захиракунии файл"
 
-#: ../urpm.pm:1
+#: ../urpmi:225
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Шумо кӯшиши коргузории бастаҳои таъминоти барномавии зеринро дар компютери "
+"худ карда истодаед:\n"
+"\n"
+"%s\n"
+"\n"
+"Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
+msgid "Install it"
+msgstr "Онро коргузорӣ кунед"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Нусхабардорӣ нагузашт"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Феҳристи [%s] аллакай мавҷуд аст, марҳамат карда дигар феҳристро барои "
+"маърӯзаи оиди хато, истифода баред ё онро нобуд созед"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - ба таври маҷбурӣ файлҳои hdlist-ро созед.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Офридани феҳристи [%s] барои маърӯзаи ғалат номумкин"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
+msgid "Copying failed"
+msgstr "Нусхабардорӣ нагузашт"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
+msgid "Only superuser is allowed to install packages"
+msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - қуттии оянда қуттии сарчашмавӣ аст (ҳамчун --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Яке аз қуттиҳои зерин даркор аст:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "коргузории %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Интихоби шумо чист? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "хониши файлҳои rpm аз [%s]"
+msgid "Package installation..."
+msgstr "барномаи коромода насб мегардад..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "нусхабардории файли тавсифоти \"%s\"..."
+msgid "Initializing..."
+msgstr "Коргузорӣ намудан..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-" --auto         - ба таври автоматӣ барномаҳои коромодаро аз "
-"барномаҳоипешниҳодшуда интихоб намоед.\n"
+"Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Хориҷкунӣ нагузашт"
+msgid "do you agree ?"
+msgstr "шумо розӣ ҳастед ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - сарчашмаи маҷозие ки ҳамеша up-to-date аст тартиб диҳед,\n"
-"                   танҳо файли суратҷаласа иҷозат дода шудааст://.\n"
+"Азбаски қуттиҳои зерин барои аз нав намудани боқимондаҳояш хориҷ бояд\n"
+"кард, онгоҳ коргузориро давом додан мумкин нест\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "қуттии %s ёфт нашуд."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Қуттиҳои зерин бояд хориҷ карда шаванд, то ки дигаронаш нав кардашаванд:\n"
+"%s\n"
+"Шумо розӣ ҳастед?"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "хориҷкунии миёнаи \"%s\""
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Бекор кардан"
+msgid "unable to get source packages, aborting"
+msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - қуттии оянда қуттии аввала аст (ба монандӣ -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - муҳити махсусро истифода баред (одатан ҳисоботи\n"
-"                   хатогиҳо).\n"
+msgid "Press Enter when ready..."
+msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
-"банавъҳо ҷудо намоед.\n"
+msgid "Downloading package `%s'..."
+msgstr "Фаровири қуттии `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "дохилшавии муҳити \"%s\" номумкин"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% аз они %s тамом шуд, ETA = %s, суръат = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "офаридани муҳити \"%s\" номумкин\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% ба охир расид, суръат = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
+msgid "The following packages have bad signatures"
+msgstr "Қуттиҳои зерин имзоҳои бад доранд"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - рӯгирифти config дар намуди нишонванди urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Шумо бояд ҳуқуқи root-ро дошта бошед барои насб намудани вобастагиҳоизерин:\n"
+"коргузорӣ ба амал наомад, якчанд файлҳо мавҷуд нестанд:\n"
 "%s\n"
+"Мумкин шумо додаҳои urpmi-ро нав мекунед"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - чопкунии changelog.\n"
+msgid "Installation failed"
+msgstr "Коргузорӣ нагузашт"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
+msgid "distributing %s"
+msgstr "тақсимкунии %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
+msgid "installing %s"
+msgstr "коргузории %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "webfetch пайдо нагардид, webfetch пуштибонӣ мегардад: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "санҷидани файли hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "нусхабардории файли hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н)  "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d коргузорӣ амалӣ нагардид"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"сарчашмаи маҷозӣ \"%s\" бояд url-и холӣ дошта бошад, сарчашма эътиборнадорад"
+msgid "Installation is possible"
+msgstr "Коргузорӣ мумкин аст"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
+msgid "Everything already installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Ҳеҷ кор накунед"
+msgid "restarting urpmi"
+msgstr "urpmi бозоғоз шуда истодааст"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"истифода: urpmi.addmedia [хосиятҳо] <ном> <url> [with <relative_path>]\n"
+"дар куҷо <url> яке аз\n"
+"       file://<роҳ>\n"
+"       ftp://<номи дохилӣ>:<гузарвожа>@<соҳиб>/<роҳ> бо <номи нисбии файли "
+"hdlist>\n"
+"       ftp://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
+"       http://<соҳиб>/<роҳ> бо <номи нисбии файли hdlist>\n"
+"       хориҷшаванда://<роҳ>\n"
+"\n"
+"ва [хосиятҳо] аз\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "барои навъи параллелӣ расонаи вобасташуда истифода мешавад: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - create an update medium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "васлкунии %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr ""
+"  --probe-synthesis - кӯшиши ёфтан ва истифодаи файли synthesis-ро намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
-"аз паи муҳити \"%s\" шудан номумкин чунки файли рӯйхат аллакай бо муҳити "
-"дигар истифода шудааст"
+"  --probe-hdlist - барои кофтан ва истифодаи файли hdlist кӯшиш намоед.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+" --no-probe     - барои дарёфти  synthesis ё файли hdlist кӯшиш накунед.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --disrtib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
+"манбаъҳоро                    созед.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% аз они %s тамом шуд, ETA = %s, суръат = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - барои қисми тақсимотии ХХХ ба таври автоматӣ "
+"сарчашмаросозед\n"
+"                    XXX метавонад main, contrib, updates бошад ё ин ки\n"
+"                   ҳама чизе ки аллакай амалӣ шудааст ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
-"аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
+"  --from         - барои оинаҳои рӯйхати url-и додашуда истифода баред\n"
+"                   аз рӯи пешфарз истифода мешавад%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+" --version      - аз рӯи пешфарз намуди нишондодашудаи тақсимотро "
+"истифодабаред\n"
+"                   тафсири тақсимоте ки бо барномаи коромодаи mandrake-"
+"release\n"
+"                   муқаррар шудааст, истифода мегардад.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - барои хориҷи барномаи коромода ҳеҷ чизро пешниҳоднакунед, "
-"коргузориро қатъ накунед.\n"
+"  --arch         - санъати нишондода шударо аз рӯи пешфарз истифода баред\n"
+"                   санъати барномаи коромодаи муқарраршуда истифода мешавад\n"
+"                   mandrake-release.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"нашри urpmq %s\n"
-"Ҳуқуқи Муфаллифӣ (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад.\n"
-"\n"
-"истифода:\n"
+"  --virtual      - сарчашмаи маҷозие ки ҳамеша up-to-date аст тартиб диҳед,\n"
+"                   танҳо файли суратҷаласа иҷозат дода шудааст://.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - тафтиши файли MD5SUM-ро хомӯш кунед.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - чопи гурӯҳҳо ҳамчун бо ном.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "муҳити \"%s\" интихоб нашудааст"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - ба таври маҷбурӣ файлҳои hdlist-ро созед.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Танҳо фавқулкорванд барои коргузоштани қуттиҳо рухсат дорад"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "ба cooker-и тақсимотӣ навоварӣ дароварда намешавад\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "барои %s давраи махсус истифода мегардад\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "барқароркунии оинаҳо дар %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ёфтани файли hdlist барои \"%s\" номумкин, муҳит рад шуд"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - дарозии тарокуниши хурд, пешфарз %d мебошад.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "нав кардани муҳити \"%s\" номумкин\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - қавси чап барои кушодани ифодаи гурӯҳ.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<роҳи нисбии hdlist> ҳозир нест\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "нуқтаи васлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "`with' барои сарчашмаи шабакагӣ вуҷуд надорад\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - амалгари дучанда AND, ба true бар мегардад, агар ҳардуи\n"
-"                   ифодаҳо дуруст бошанд.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "офаридани муҳити \"%s\" номумкин\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"роҳ ба сарчашма нест \"%s\",\n"
-"ин ҳангоми ба таври дастӣ насб намудани феҳрист дар ҳолати сохтанисарчашма "
-"ба амал меояд."
+"истифода: urpmi.removemedia [-a] <ном> ...\n"
+"дар куҷо <ном> ин номи муҳит барои хориҷ кардан.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - интихоби ҳама муҳит.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "офаридани муҳит номумкин аст"
+"\n"
+"интихоби номуаяйн '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "барқароркунии файли rpm аз миёна \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ба хориҷкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia истифода баред)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Шумо бастаи барномаҳои сарчашмавиро интихоб кардед:\n"
-"\n"
-"%s\n"
-"\n"
-"Эҳтимолан зарурати коргузории он дар мошинаи шумо нест\n"
-"(коргузории он ба шумо имконияти воридкунии тағиротҳо ба рамзи мабдаъ ва "
-"баъд онро ҳамгардон кунед).\n"
-"\n"
-"Шумо чи кор кардан мехоҳед?"
+"элемент барои хориҷ кардан ҳозир нест\n"
+"(яке аз %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "тақсимкунии %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"истифода: urpmi.removemedia [-a] <ном> ...\n"
+"дар куҷо <ном> ин номи муҳит барои нав кардан.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Коргузорӣ нагузашт"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "файли танзимдарории [%s] нависед"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - зӯран навкунии gpg-калид.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - ҳамаи сарчашмаҳои ҷудонашавандаро интихоб намоед.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - пеш аз коргузорӣ намудан имзоро тафтиш намоед \n"
-"                   (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
-"рӯипешфарз).\n"
+"элемент барои нав кардан ҳозир нест\n"
+"(яке аз %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"нашри urpmf %s\n"
+"Ҳуқуқи Муаллифӣ (C) 2002 MandrakeSoft.\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад.\n"
+"\n"
+"истифода:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - рӯйхаткунии қуттиҳои дастрас.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - create an update medium.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - рӯйхати муҳитҳои дастрас ва url-и онҳо.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ҷустуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - рӯгирифти config дар намуди нишонванди urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - рӯйхаткунии гиреҳҳои дастрас бо истифодаи --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - рӯйхаткунии тахаллусҳои пареллели дастрас.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "хориҷи қуттии %s "
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - номгӯҳои барномаҳои коромодае ки дар urpmi db "
+"ифодашудааст гиред\n"
+"                   дар stdout (танҳо барои root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - барои қисми тақсимотии ХХХ ба таври автоматӣ "
-"сарчашмаросозед\n"
-"                    XXX метавонад main, contrib, updates бошад ё ин ки\n"
-"                   ҳама чизе ки аллакай амалӣ шудааст ;-)\n"
+"  --sources      - пеш аз қабули маълумоти лозима ҳамаи барномаҳои "
+"коромодарогиред\n"
+"                   (танҳо барои root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --ҳаҷм          - чопи ҳаҷми тэг: ҳаҷм.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - танзими urpmi дар ҳаркат аз дарахти distrib.\n"
+"                   Ин интихоб пурсиши тақсимотро иҷозат медиҳад.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "барои нигоҳдории %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - чопкунии changelog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "аз сабаби қонеъ набудан %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - дархости васеъ ба тобеиятҳои қуттӣ.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Коргузориши автоматикии қуттиҳо...\n"
-"Шумо коргузориши куттии '%s'-ро талаб кардед\n"
+"  -u             - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi манбаи маълумот дастнорас аст"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - ҳосилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
 
-#: ../urpmi:1
+#: ../urpmq:82
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - интиқоли файлҳои қисан боркардашударо идома медиҳад\n"
-"                   (--no-resume онро хомӯш мекунад, бо нобаёнӣ хомӯш карда "
-"мешавад).\n"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - ҷустуҷӯи баръакс барои қуттии талабшуда.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - ахбороти фоиданокро дар намуди барои хондан қуллай чоп "
+"кардан.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - тафтиши файли MD5SUM-ро хомӯш кунед.\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - чопи гурӯҳҳо ҳамчун бо ном.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:87
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - чопи нашр ва нусха ҳамчун бо ном.\n"
 
-#: ../urpmi:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Шумо кӯшиши коргузории бастаҳои таъминоти барномавии зеринро дар компютери "
-"худ карда истодаед:\n"
-"\n"
-"%s\n"
-"\n"
-"Шумо онро танҳо захира карда метавонед. Интихоби шумо чӣ гуна аст?"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  --fuzzy        - дар асоси мантиқи нодуруст ба кофтукобӣ оғоз намоед(ба "
-"монандӣ -y).\n"
+"  номҳо ва ё файлҳои rpm дар сатри фармонӣ ишора шуда дархост мегарданд.\n"
 
-#: ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes танҳо истифода бурда мешавад бо --parallel"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:327
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"  --probe-hdlist - барои кофтан ва истифодаи файли hdlist кӯшиш намоед.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "due to missing %s"
-msgstr "аз сабаби мавҷуд набудан %s"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"истифода: urpmi.removemedia [-a] <ном> ...\n"
-"дар куҷо <ном> ин номи муҳит барои нав кардан.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Яке аз қуттиҳои зерин барои коргузории %s лозим аст:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-" --test         - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "нашри urpmq %s\n"
+#~ "Ҳуқуқи Муфаллифӣ (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+#~ "шавад.\n"
+#~ "\n"
+#~ "истифода:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "webfetch-и номаълум `%s' !!!\n"
diff --git a/po/th.po b/po/th.po
index f3ed7d77..7281bbd9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -36,835 +36,755 @@ msgstr "Yyช"
 msgid "Nn"
 msgstr "Nnม"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - ทำการสร้างมีเดียจากอุปกรณ์สำหรับติดตั้งโดยอัตโนมัติ\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to open rpmdb"
-msgstr "ไม่สามารถลงทะเบียน rpm file"
-
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:23
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - พิมพ์ข้อความช่วย\n"
+msgid "installing %s\n"
+msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpmi:1
+#: ../_irpm:33
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "หนึ่งใน Packages ต่อไปนี้ต้องมีในการจะติดตั้ง %s:"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"การติดตั้ง Package แบบอัตโนมัต...\n"
+"คุณได้เลือกที่จะติดตั้ง Package %s\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "removing package %s"
-msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
+#, c-format
+msgid "Is this OK?"
+msgstr "ตกลงไหมครับ"
 
-#: ../urpm.pm:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "Ok"
+msgstr "ตกลง"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr ""
+msgid "Cancel"
+msgstr "ยกเลิก"
 
-#: ../urpmi:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "Everything already installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+msgid " (Y/n) "
+msgstr " (Y/n) "
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../_irpm:63
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+msgid "%s: command not found\n"
+msgstr "%s: ไม่พบคำสั่งนี้\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "using process %d for executing transaction"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:13
+#, c-format
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - พิมพ์ข้อความช่วย\n"
+
+#: ../rpm-find-leaves:14
 #, fuzzy, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr " --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr " --group        - พิมพ์ tag group: group."
+
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:57
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "ต้องการเลือกอะไรครับ  (1-%d) "
+msgid "unknown protocol defined for %s"
+msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "found %d headers in cache"
-msgstr "พบ %d header ใน cache"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "มีหลาย package ที่มีชื่อไฟล์เหมือนกับ \"%s\""
+msgid "unable to handle protocol: %s"
+msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - กำหนดชื่อผู้ใช้และรหัสผ่านเพื่อใช้พร็อกซี่\n"
-"                   ในการตรวจสอบ (รูปแบบเป็น <user:password>)\n"
+msgid "syntax error in config file at line %s"
+msgstr "มีข้อผิดพลาดใน config file บรรทัดที่ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "ทำการผ่านครั้งที่สองเพื่อทดสอบ ความเป็นอิสระ\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,อุปกรณ์ถูกยกเลิกไม่ใช้"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, อุปกรณ์ถูกยกเลิกไม่ใช้"
 
-#: ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - แสดงรายชื่อ parallel aliases.\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "ไม่สามารถดูแลอุปกรณ์\"%s\"เพราะว่า list file ได้ถูกใช้โดยอุปกรณ์อื่นแล้ว"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:202
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "การอ่านข้อมูลล้มเหลว: %s"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "ไม่สามารถใช้ชื่อ \"%s\" สำหรับอุปกรณ์ที่ไม่มีชื่อเพราะว่ามันได้ถูกใช้แล้ว"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "ไม่สามารถตรวจสอบ list file สำหรับ \"%s\", medium ignored"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "ไม่สามารถนำอุปกรณ์ \"%s\" มาใช้เพราะว่าไม่มี list file[%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:213
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "ไม่สามารถกำหนดอุปกรณ์ด้วย hdlist file นี้ [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Package installation..."
-msgstr ""
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "ไม่สามารถใช้งาน hdlist file \"%s\", medium ignored"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "ไม่สามารถใช้งาน list file ของ \"%s\", medium ignored"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "การติดตั้งไม่สำเร็จ"
-
-#: ../urpm.pm:1
-#, c-format
 msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ Mandrake/base/hdlists)"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:262
+#, fuzzy, c-format
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
+
+#: ../urpm.pm:271
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "การเลือกไม่ถูกต้อง ลองใหม่ครับ\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "ไม่สามารถหา hdlist file สำหรับ\"%s\",medium ignored"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "ไม่สามารถหา list file สำหรับ\"%s\",medium ignored"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr " --summary      - พิมพ์ tag summary: summary"
+#: ../urpm.pm:301
+#, c-format
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "list file ไม่ปะติดปะต่อ \"%s\", medium ignored"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:309
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "packages ต่อไปนี้มี %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "ไม่สามารถตรวจสอบ list file สำหรับ \"%s\", medium ignored"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "การติดตั้งไม่สำเร็จ"
+#: ../urpm.pm:342
+#, c-format
+msgid "too many mount points for removable medium \"%s\""
+msgstr "จำนวนเม้าท์พ้อยท์มากเกินไปสำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
+msgid "taking removable device as \"%s\""
+msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
+msgid "using different removable device [%s] for \"%s\""
+msgstr "ใช้อุปกรณ์แบบย้ายเข้าออกได้ที่แตกต่าง [%s] สำหรับ \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - เลือกอินเทอร์เฟซที่ดีที่สุดตามสภาพเอ็นไวลอนเม็นท์ของ\n"
-"                   X หรือโหมดตัวอักษร\n"
+msgid "unable to write config file [%s]"
+msgstr "ไม่สามารถเขียน config file [%s]"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Downloading package `%s'..."
-msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
+#: ../urpm.pm:390
+#, c-format
+msgid "write config file [%s]"
+msgstr "เขียน config file[%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --เลือกอัตโนมัติ  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:423
 #, c-format
-msgid "no package named %s"
-msgstr "ไม่มี package ที่ชื่อ %s"
+msgid "examining parallel handler in file [%s]"
+msgstr "กำลังตรวจสอบ parallel handler ในไฟล์ [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "พบ parallel handler สำหรับ %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
-"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
+msgid "using associated media for parallel mode: %s"
+msgstr "กำลังใช้อุปกรณ์ที่เกี่ยวข้องสำหรับ parallel mode : %s "
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"การใช้: urpmi.removemedia [-a] <name> ...\n"
-"ในขณะที่ <name> เป็นชื่อของอุปกรณ์ที่ต้องการเอาออก\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "ไม่สามารถใช้ parallel option \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, fuzzy, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"แพ็คเกจต่อไปนี้จะต้องถูกลบทิ้งเพื่อจะทำการอัพเกรดโปรมแกรมอื่น:\n"
-"%s\n"
-"คุณยอมให้ทำการลบทิ้งหรือไม่?"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr "--synthesis cannot be used with --media, --update or --parallel"
 
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid "`with' missing for network media\n"
-msgstr " `with' ไม่พบสำหรับอุปกรณ์ ftp\n"
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
+#, c-format
+msgid "examining synthesis file [%s]"
+msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
+
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
+#, c-format
+msgid "examining hdlist file [%s]"
+msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, fuzzy, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, fuzzy, c-format
-msgid "unknown package"
-msgstr "แพ็คเกจไม่รู้จัก"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "การติดตั้งสามารถทำได้"
+msgid "performing second pass to compute dependencies\n"
+msgstr "ทำการผ่านครั้งที่สองเพื่อทดสอบ ความเป็นอิสระ\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, fuzzy, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"แพ็คเกจต่อไปนี้จะต้องถูกลบทิ้งเพื่อจะทำการอัพเกรดโปรมแกรมอื่น:\n"
-"%s\n"
-"คุณยอมให้ทำการลบทิ้งหรือไม่?"
+msgid "skipping package %s"
+msgstr "ไม่มี package ที่ชื่อ %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "เพื่อที่จะแก้ใขปัญหาการเข้ากันได้ packages ต่อไปนี้จะถูกติดตั้ง (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "ไม่สามารถนำอุปกรณ์ \"%s\" มาใช้เพราะว่าไม่มี list file[%s]"
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
+#, fuzzy, c-format
+msgid "unable to open rpmdb"
+msgstr "ไม่สามารถลงทะเบียน rpm file"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
+msgid "medium \"%s\" already exists"
+msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - โหมดคำ\n"
+msgid "added medium %s"
+msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr ""
+msgid "unable to access first installation medium"
+msgstr "ไม่สามารถเข้าถึงอุปกรณ์เพื่อใช้ในการติดตั้งอันแรก"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+msgid "copying hdlists file..."
+msgstr "กำลังคัดลอกไฟล์ hdlist"
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, fuzzy, c-format
-msgid "  --all          - print all tags.\n"
-msgstr " --all          - พิมพ์ tag ทั้งหมด"
+msgid "...copying failed"
+msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\" ถูกระบุว่าถอดเปลี่ยนได้แต่มันไม่ใช่"
+msgid "...copying done"
+msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
+#, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ Mandrake/base/hdlists)"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+#: ../urpm.pm:691
+#, c-format
+msgid "retrieving hdlists file..."
+msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "กรุณากด enter เมื่อพร้อม"
+msgid "...retrieving done"
+msgstr "การอ่านข้อมูลเรียบร้อย"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"ทางเลือกไม่รู้จัก '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "การอ่านข้อมูลล้มเหลว: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "คำอธิบาย hdlist ไม่ถูกต้อง \"%s\" ในไฟล์ hdlists"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, fuzzy, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
-#, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "พยายามที่จะเลือกใช้อุปกรณ์ที่ไม่มี\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
+msgid "selecting multiple media: %s"
+msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-node     - แสดงรายชื่อnodesที่มีอยู่ขณะใช้--parallel \n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "สร้าง hdlist [%s]"
+msgid "removing medium \"%s\""
+msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
+#, fuzzy, c-format
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
+
+#: ../urpm.pm:1004
+#, c-format
+msgid "copying description file of \"%s\"..."
+msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, fuzzy, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "กำลังตรวจสอบไฟล์ MD5SUM"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: ไม่พบคำสั่งนี้\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to register rpm file"
-msgstr "ไม่สามารถใช้งาน rpm file [%s]"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - ยอมให้ผู้ใช้ติดตั้งแพ็คเกจโดยไม่ต้อง\n"
-"                   ตรวจสอบ ความเป็นอิสระ\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to handle protocol: %s"
-msgstr "ไม่สามารถใช้งานโปรโตคอล: %s"
+#: ../urpm.pm:1109
+#, fuzzy, c-format
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "ไม่สามารถอ่านไฟล์ rpm จาก [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
+msgid "no rpm files found from [%s]"
+msgstr "ไม่พบ rpm files จาก [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
+#, fuzzy, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+
+#: ../urpm.pm:1396
+#, fuzzy, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
+
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "มีข้อผิดพลาดใน config file บรรทัดที่ %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "ชื่อไฟล์หรือชื่อ rpm ที่ให้ไว้ในคำสั่งถูกติดตั้งแล้ว\n"
+#: ../urpm.pm:1490
+#, c-format
+msgid "no hdlist file found for medium \"%s\""
+msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - ใช้ในการกำหนดพร็อกซี่ HTTP หมายเลขพอร์ทสมมุติเป็น\n"
-"                    1080(รูปแบบคือ <proxyhost[:port]>)\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "ไฟล์ [%s] มีใช้งานอยู่ในที่เดียวกันอยู่แล้ว\"%s\""
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
+#: ../urpm.pm:1541
+#, c-format
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "ไม่สามารถ parse hdlist file of \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "ย้าย %s ใน depslist"
+msgid "unable to write list file of \"%s\""
+msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
+#: ../urpm.pm:1586
+#, c-format
+msgid "writing list file for medium \"%s\""
+msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
+msgid "nothing written in list file for \"%s\""
+msgstr "ไม่มีการเขียนใน list file สำหรับ\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, fuzzy, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "กำลังอ่านคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, fuzzy, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, fuzzy, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr " --serial       - พิมพ์ tag serial: serial"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "ไม่รู้จักโปรโตคอลที่ระบุไว้%s"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr " --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
+msgid "reading headers from medium \"%s\""
+msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
+msgid "building hdlist [%s]"
+msgstr "สร้าง hdlist [%s]"
 
-#: ../_irpm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "installing %s\n"
-msgstr "กำลังติดตั้ง %s\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1745
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
+msgid "found %d headers in cache"
+msgstr "พบ %d header ใน cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "กำลังลบ %d headerที่ล้าสมัยใน cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
+msgid "mounting %s"
+msgstr "กำลังติดตั้ง %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ไม่มีข้อมูลที่จะทำการเอาออก\n"
-"(หนึ่งใน %s)\n"
+msgid "unmounting %s"
+msgstr "กำลังถอดถอน %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
+msgid "relocated %s entries in depslist"
+msgstr "ย้าย %s ใน depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "no entries relocated in depslist"
+msgstr "ไม่มีค่าซึ่งถูกย้ายใน depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "ไม่สามารถอ่านไฟล์ rpm จาก [%s]: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
+#: ../urpm.pm:1948
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, fuzzy, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
+msgid "unable to register rpm file"
+msgstr "ไม่สามารถใช้งาน rpm file [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr " --group        - พิมพ์ tag group: group."
+msgid "error registering local packages"
+msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, อุปกรณ์ถูกยกเลิกไม่ใช้"
+msgid "no package named %s"
+msgstr "ไม่มี package ที่ชื่อ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr " inputไม่ถูกต้อง :[%s]"
+msgid "The following packages contain %s: %s"
+msgstr "packages ต่อไปนี้มี %s: %s"
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "removing package %s will break your system"
-msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
+#, c-format
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "มีหลาย package ที่มีชื่อไฟล์เหมือนกับ \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "ไม่สามารถที่จะผ่าน [%s] ด้วยค่า \"%s\"อย่างถูกต้อง"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpm.pm:2362
+#, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"แพ็คเกจที่กำหนดไว้บางตัวไม่สามารถติดตั้งได้:\n"
-"%s\n"
-"คุณเห็นด้วยหรือไม่?"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "ไม่มีค่าซึ่งถูกย้ายใน depslist"
+msgid "package %s is not found."
+msgstr "หา %s package ไม่พบ"
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+msgid "urpmi database locked"
+msgstr "ฐานข้อมูล urpmi ถูกล็อก"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+msgid "medium \"%s\" is not selected"
+msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "list file ไม่ปะติดปะต่อ \"%s\", medium ignored"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "อุปกรณ์ที่ไม่เชื่อมกัน \"%s\" ถูกระบุว่าถอดเปลี่ยนได้แต่มันไม่ใช่"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "การอ่านข้อมูลเรียบร้อย"
+msgid "unable to access medium \"%s\""
+msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr " inputไม่ถูกต้อง :[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, fuzzy, c-format
-msgid "skipping package %s"
-msgstr "ไม่มี package ที่ชื่อ %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr ""
+msgid "Preparing..."
+msgstr "กำลังเตรียม..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"โปรแกรม urpmi เวอร์ชั่น %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "ไม่สามารถที่จะผ่าน [%s] ด้วยค่า \"%s\"อย่างถูกต้อง"
+#: ../urpm.pm:2786
+#, fuzzy, c-format
+msgid "unable to create transaction"
+msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2794
 #, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+msgid "removing package %s"
+msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "ไม่สามารถกำหนดอุปกรณ์ด้วย hdlist file นี้ [%s]"
+msgid "unable to remove package %s"
+msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "ไม่สามารถ parse hdlist file of \"%s\""
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,อุปกรณ์ถูกยกเลิกไม่ใช้"
+msgid "unable to install package %s"
+msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s ขัดแย้งกับ %s"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "กำลังลบ %d headerที่ล้าสมัยใน cache"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "ไม่สามารถแก้ไขอุปกรณ์\"%s\"\n"
+msgid "due to missing %s"
+msgstr "wget หายไป\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
+msgid "due to unsatisfied %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
-
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "Preparing..."
-msgstr "กำลังเตรียม..."
+msgid "trying to promote %s"
+msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3012
 #, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+msgid "in order to keep %s"
+msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "ใช้อุปกรณ์แบบย้ายเข้าออกได้ที่แตกต่าง [%s] สำหรับ \"%s\""
+#: ../urpm.pm:3035
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, fuzzy, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
+msgid "due to conflicts with %s"
+msgstr "%s ขัดแย้งกับ %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
+msgid "unrequested"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - remove rpm from cache before anything else.\n"
+msgid "Missing signature (%s)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "ไม่สามารถใช้ชื่อ \"%s\" สำหรับอุปกรณ์ที่ไม่มีชื่อเพราะว่ามันได้ถูกใช้แล้ว"
+msgid "bad proxy declaration on command line\n"
+msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr " --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "อุปกรณ์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่แล้ว ,medium ignore"
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "การเลือกไม่ถูกต้อง ลองใหม่ครับ\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -881,469 +801,455 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "การคัดลอกสมบูรณ์"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "ไม่สามารถใช้ parallel option \"%s\""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "ไม่สามารถเข้าถึงอุปกรณ์เพื่อใช้ในการติดตั้งอันแรก"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
+
+#: ../urpme:47
 #, c-format
-msgid "virtual medium need to be local"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "error registering local packages"
-msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:50
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, fuzzy, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+msgid "unknown packages"
+msgstr "แพ็คเกจไม่รู้จัก"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
+#: ../urpme:83
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "แพ็คเกจไม่รู้จัก"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "no rpm files found from [%s]"
-msgstr "ไม่พบ rpm files จาก [%s]"
+#: ../urpme:93
+#, fuzzy, c-format
+msgid "removing package %s will break your system"
+msgstr "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
+
+#: ../urpme:95
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
 
-#: ../urpm.pm:1
+#: ../urpme:99
+#, fuzzy, c-format
+msgid "Checking to remove the following packages"
+msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
+
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "ไม่มีการเขียนใน list file สำหรับ\"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, fuzzy, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+msgid "removing %s"
+msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, fuzzy, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "                  command line แต่ไม่มีชื่อ package)"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to install package %s"
-msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
+msgid "Removing failed"
+msgstr "...การคัดลอกล้มเหลว"
 
-#: ../urpmi:1
-#, c-format
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - ยอมให้ผู้ใช้สามารถติดตั้งแพ็คเกจโดยไม่จำเป็นต้อง\n"
-"                   มีการตรวจสอบความเป็นอิสระและความถูกต้อง\n"
+"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"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr ""
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../urpm/args.pm:1
-#, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, fuzzy, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to write config file [%s]"
-msgstr "ไม่สามารถเขียน config file [%s]"
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpme:1
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
-#, c-format
+#: ../urpmf:38
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - โหมดคำ\n"
+
+#: ../urpmf:39
+#, fuzzy, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
+"  --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"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
+#: ../urpmf:41
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, fuzzy, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
+msgid "  --all          - print all tags.\n"
+msgstr " --all          - พิมพ์ tag ทั้งหมด"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, fuzzy, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+#: ../urpmf:44
+#, fuzzy, c-format
+msgid "  --size         - print tag size: size.\n"
+msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
+#: ../urpmf:45
+#, fuzzy, c-format
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, fuzzy, c-format
-msgid "Checking to remove the following packages"
-msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr " --summary      - พิมพ์ tag summary: summary"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unrequested"
-msgstr ""
+#: ../urpmf:47
+#, fuzzy, c-format
+msgid "  --description  - print tag description: description.\n"
+msgstr " --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ไม่สามารถใช้งาน rpm file [%s]"
+#: ../urpmf:48
+#, fuzzy, c-format
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr " --group        - พิมพ์ tag group: group."
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, fuzzy, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr " --group        - พิมพ์ tag group: group."
+
+#: ../urpmf:50
+#, fuzzy, c-format
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
+#: ../urpmf:51
+#, fuzzy, c-format
+msgid "  --url          - print tag url: url.\n"
+msgstr " --serial       - พิมพ์ tag serial: serial"
 
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
+#: ../urpmf:52
+#, fuzzy, c-format
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr " --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "ไม่สามารถอ่าน rpm file [%s] จาก \"%s\""
+#: ../urpmf:53
+#, fuzzy, c-format
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr " --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmi:1
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
+#: ../urpmf:54
+#, fuzzy, c-format
+msgid "  --files        - print tag files: all files.\n"
+msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
-#: ../urpm.pm:1 ../urpmi:1
-#, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
+#: ../urpmf:55
+#, fuzzy, c-format
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr " --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmq:1
+#: ../urpmf:56
 #, fuzzy, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr " --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-
-#: ../urpmi.addmedia:1
-#, fuzzy, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
 "                   บัก).\n"
 
-#: ../urpme:1
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
+
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
 
-#: ../urpmf:1
+#: ../urpmf:61
 #, fuzzy, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
+
+#: ../urpmf:62
+#, fuzzy, c-format
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
 
-#: ../urpmi:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "กำลังถอดถอน %s"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
+#: ../urpmf:64
+#, fuzzy, c-format
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
 
-#: ../urpmi:1
-#, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr ""
+#: ../urpmf:65
+#, fuzzy, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "กำลังติดตั้ง $rpm\n"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "...copying failed"
-msgstr "การคัดลอกสมบูรณ์"
+msgid "using specific environment on %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "ไม่สามารถใช้งาน hdlist file \"%s\", medium ignored"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - โหมดเงียบ\n"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"โปรแกรม urpmi เวอร์ชั่น %s\n"
+"Copyright (C) 1999, 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:1
+#: ../urpmi:82
 #, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - โหมดคำ\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmq:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --โค้ด      - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --เลือกอัตโนมัติ  - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
 
-#: ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  --headers      - แยกส่วน headers จากแพ็คเกจซึ่งแสดงไว้ในรายการของ urpmi db "
-"ไปยัง\n"
-"                   stdout (เฉพาะรูทเท่านั้น).\n"
 
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "แพ็คเกจไม่รู้จัก"
+#: ../urpmi:86 ../urpmq:51
+#, c-format
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:91
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "ไฟล์ [%s] มีใช้งานอยู่ในที่เดียวกันอยู่แล้ว\"%s\""
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - ค้นหาแบบไม่เจาะจง(เช่นเดียวกับ -y).\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ไม่มีอะไรที่จะเอาออก(ใช้ urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - แพ็คเกจต่อไปเป็นส่วนของโค้ด (เช่นเดียวกับ -s).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "ไม่สามารถหา list file สำหรับ\"%s\",medium ignored"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:95
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - พิมพ์ข้อความช่วย\n"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - remove rpm from cache before anything else.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "พบ parallel handler สำหรับ %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
 
-#: ../urpmf:1
+#: ../urpmi:98
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
+"  --allow-nodeps - ยอมให้ผู้ใช้ติดตั้งแพ็คเกจโดยไม่ต้อง\n"
+"                   ตรวจสอบ ความเป็นอิสระ\n"
 
-#: ../urpmq:1
+#: ../urpmi:100
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - reverse search to what requires package.\n"
-
-#: ../urpmf:1
-#, 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"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\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:1
-#, fuzzy, c-format
-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:1
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
-msgstr "--synthesis cannot be used with --media, --update or --parallel"
+"  --allow-force  - ยอมให้ผู้ใช้สามารถติดตั้งแพ็คเกจโดยไม่จำเป็นต้อง\n"
+"                   มีการตรวจสอบความเป็นอิสระและความถูกต้อง\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:104
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "Is this OK?"
-msgstr "ตกลงไหมครับ"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr ""
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "กำลังตรวจสอบ parallel handler ในไฟล์ [%s]"
-
-#: ../urpme:1
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:109
 #, fuzzy, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "ไม่สามารถเขียน list file ของ\"%s\""
+msgid ""
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
+msgstr ""
+"  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
+"                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - ใช้ในการกำหนดพร็อกซี่ HTTP หมายเลขพอร์ทสมมุติเป็น\n"
+"                    1080(รูปแบบคือ <proxyhost[:port]>)\n"
 
-#: ../urpmq:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ขยายการค้นหาให้รวมถึงความเป็นอิสระของโปรแกรม\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - กำหนดชื่อผู้ใช้และรหัสผ่านเพื่อใช้พร็อกซี่\n"
+"                   ในการตรวจสอบ (รูปแบบเป็น <user:password>)\n"
 
-#: ../urpmi:1
+#: ../urpmi:115
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1352,155 +1258,213 @@ msgstr ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:119
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr ""
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr " --group        - พิมพ์ tag group: group."
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "ไม่สามารถเขียน list file ของ\"%s\""
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - เลือกอินเทอร์เฟซที่ดีที่สุดตามสภาพเอ็นไวลอนเม็นท์ของ\n"
+"                   X หรือโหมดตัวอักษร\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr " --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
+#: ../urpmi:122
+#, c-format
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgstr ""
+"  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
+"                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:125
 #, fuzzy, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "พยายามที่จะเลือกใช้อุปกรณ์ที่ไม่มี\"%s\""
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr " --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
+#: ../urpmi:126
+#, c-format
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr ""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Copying failed"
-msgstr "การคัดลอกสมบูรณ์"
+#: ../urpmi:127 ../urpmq:79
+#, c-format
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่งที่พิมพ์\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:128
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - ย้อมให้มีการค้นหาแพ็คเกจจากที่ป้อนให้\n"
 
-#: ../urpmq:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes can only be used with --parallel"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - ใช้การค้นหาแบบไม่เจาะจง(เช่นเดียวกับการใช้ --fuzzy).\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - แพ็คเกจต่อไปเป็นแพ็คเกจโค้ด (เช่นเดียวกับ --src).\n"
 
-#: ../urpmi:1
+#: ../urpmi:132
+#, c-format
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - โหมดเงียบ\n"
+
+#: ../urpmi:134
 #, fuzzy, c-format
-msgid "installing %s"
-msgstr "กำลังติดตั้ง %s\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "ชื่อไฟล์หรือชื่อ rpm ที่ให้ไว้ในคำสั่งถูกติดตั้งแล้ว\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "กำลังอ่านไฟล์ rpm จาก [%s]"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:204
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --อัตโนมัติ         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+
+#: ../urpmi:212
+#, c-format
+msgid "Do nothing"
+msgstr "ไม่ต้องทำอะไร"
+
+#: ../urpmi:213
+#, c-format
+msgid "Yes, really install it"
+msgstr ""
+
+#: ../urpmi:214 ../urpmi:231
+#, c-format
+msgid "Save file"
+msgstr ""
+
+#: ../urpmi:225
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:230
 #, fuzzy, c-format
-msgid "Removing failed"
-msgstr "...การคัดลอกล้มเหลว"
+msgid "Install it"
+msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "หา %s package ไม่พบ"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "ไม่สามารถสร้างไดเร็คตอรี่ [%s] สำหรับรายงานบัก"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
+#, fuzzy, c-format
+msgid "Copying failed"
+msgstr "การคัดลอกสมบูรณ์"
+
+#: ../urpmi:260
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:396
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
+msgid "One of the following packages is needed:"
+msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "Cancel"
-msgstr "ยกเลิก"
+msgid "What is your choice? (1-%d) "
+msgstr "ต้องการเลือกอะไรครับ  (1-%d) "
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - แพ็คเกจต่อไปเป็นส่วนของโค้ด (เช่นเดียวกับ -s).\n"
+msgid "Package installation..."
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "Initializing..."
 msgstr ""
-"  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
-"                   บัก).\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:435
 #, fuzzy, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to access medium \"%s\""
-msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"แพ็คเกจที่กำหนดไว้บางตัวไม่สามารถติดตั้งได้:\n"
+"%s\n"
+"คุณเห็นด้วยหรือไม่?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
+msgid "do you agree ?"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, fuzzy, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr " --group        - พิมพ์ tag group: group."
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"แพ็คเกจต่อไปนี้จะต้องถูกลบทิ้งเพื่อจะทำการอัพเกรดโปรมแกรมอื่น:\n"
+"%s\n"
+"คุณยอมให้ทำการลบทิ้งหรือไม่?"
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi:461
+#, fuzzy, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"แพ็คเกจต่อไปนี้จะต้องถูกลบทิ้งเพื่อจะทำการอัพเกรดโปรมแกรมอื่น:\n"
+"%s\n"
+"คุณยอมให้ทำการลบทิ้งหรือไม่?"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "เพื่อที่จะแก้ใขปัญหาการเข้ากันได้ packages ต่อไปนี้จะถูกติดตั้ง (%d MB)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1509,401 +1473,483 @@ msgstr ""
 "คุณจะต้องเป็นรูทในการติดตั้ง ความเป็นอิสระ :\n"
 "%s\n"
 
-#: ../urpmq:1
-#, fuzzy, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr " --all          - พิมพ์ tag ทั้งหมด"
+#: ../urpmi:526 ../urpmq:296
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "ไม่สามารถใช้งาน list file ของ \"%s\", medium ignored"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../urpmf:1
+#: ../urpmi:541
+#, c-format
+msgid "Press Enter when ready..."
+msgstr "กรุณากด enter เมื่อพร้อม"
+
+#: ../urpmi:585
 #, fuzzy, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
+msgid "Downloading package `%s'..."
+msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:600
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
+msgid "        %s%% completed, speed = %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:619
 #, c-format
-msgid "copying hdlists file..."
-msgstr "กำลังคัดลอกไฟล์ hdlist"
+msgid "The following packages have bad signatures"
+msgstr "แพ็คเกจต่อไปนี้มี signatures ที่ไม่ถูกต้อง"
 
-#: ../urpm.pm:1
+#: ../urpmi:620
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
+msgid "Do you want to continue installation ?"
+msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpm.pm:1
+#: ../urpmi:640 ../urpmi:767
 #, fuzzy, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "อุปกรณ์\"%s\"พยายามเลือกใช้อุปกรณ์ที่ใช้แล้ว, medium ignored"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
+"ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#: ../urpmf:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
+#, c-format
+msgid "Installation failed"
+msgstr "การติดตั้งไม่สำเร็จ"
+
+#: ../urpmi:665
 #, fuzzy, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr " --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
+msgid "distributing %s"
+msgstr "กำลังแจกจ่าย %s\n"
+
+#: ../urpmi:673
+#, fuzzy, c-format
+msgid "installing %s"
+msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpmi:1
+#: ../urpmi:688
 #, c-format
-msgid "Do nothing"
-msgstr "ไม่ต้องทำอะไร"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:712
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "ต้องการทดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้ากันได้? (y/N)"
+
+#: ../urpmi:731
+#, c-format
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "ต้องการทดลองบังคับติดตั้ง (--force)? (y/N)"
+
+#: ../urpmi:772
 #, fuzzy, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "กำลังใช้อุปกรณ์ที่เกี่ยวข้องสำหรับ parallel mode : %s "
+msgid "%d installation transactions failed"
+msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "mounting %s"
-msgstr "กำลังติดตั้ง %s"
+msgid "Installation is possible"
+msgstr "การติดตั้งสามารถทำได้"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
+msgid "Everything already installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpmi:797
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "กำลังติดตั้ง $rpm\n"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "ไม่สามารถดูแลอุปกรณ์\"%s\"เพราะว่า list file ได้ถูกใช้โดยอุปกรณ์อื่นแล้ว"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - สร้างอุปกรณ์เพื่อการอัพเดต\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, fuzzy, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์ซึ่งอยู่ภายนอก\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, fuzzy, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, fuzzy, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "ไม่สามารถเขียน list file ของ\"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - ทำการสร้างมีเดียจากอุปกรณ์สำหรับติดตั้งโดยอัตโนมัติ\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmq:1
-#, c-format
+#: ../urpmi.addmedia:65
+#, fuzzy, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\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"
+"  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
+"                   บัก).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - พิมพ์กลุ่มพร้อมชื่อ\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "ไม่สามารถหา hdlist file สำหรับ\"%s\",medium ignored"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - บังคับการสร้างไฟล์ hdlist\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, fuzzy, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "จำนวนเม้าท์พ้อยท์มากเกินไปสำหรับอุปกรณ์แบบเคลื่อนย้ายได้\"%s\""
-
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "ไม่สามารถแก้ไขอุปกรณ์\"%s\"\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr " --group        - พิมพ์ tag group: group."
+#: ../urpmi.addmedia:190
+#, c-format
+msgid "<relative path of hdlist> missing\n"
+msgstr "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:192
 #, fuzzy, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+msgid "`with' missing for network media\n"
+msgstr " `with' ไม่พบสำหรับอุปกรณ์ ftp\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "unable to create transaction"
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
 msgstr "ไม่สามารถสร้างอุปกรณ์ \"%s\"\n"
 
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "กำลังอ่านข้อมูลไฟล์ rpm..."
+#: ../urpmi.removemedia:34
+#, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"การใช้: urpmi.removemedia [-a] <name> ...\n"
+"ในขณะที่ <name> เป็นชื่อของอุปกรณ์ที่ต้องการเอาออก\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:37
+#, c-format
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
+
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
 "\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"ทางเลือกไม่รู้จัก '%s'\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "distributing %s"
-msgstr "กำลังแจกจ่าย %s\n"
+#: ../urpmi.removemedia:48
+#, c-format
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "ไม่มีอะไรที่จะเอาออก(ใช้ urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
-msgstr "การติดตั้งไม่สำเร็จ"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"ไม่มีข้อมูลที่จะทำการเอาออก\n"
+"(หนึ่งใน %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
-msgstr "เขียน config file[%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"การใช้: urpmi.update [options] <name> ...\n"
+"โดยที่ <name> เป็นชื่อของอุปกรณ์ที่ต้องการอัพเดต\n"
+
+#: ../urpmi.update:38
+#, fuzzy, c-format
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:40
+#, c-format
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
+
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr " --a          - เลือกมีเดียที่ไม่สามารถเคลื่อนย้ายได้ทั้งหมด \n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
+#: ../urpmi.update:63
+#, c-format
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
-"                   (--no-verify-rpm disable it, default is enabled)\n"
+"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"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - สร้างอุปกรณ์เพื่อการอัพเดต\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, fuzzy, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - ใช้การค้นหาแบบไม่เจาะจง(เช่นเดียวกับการใช้ --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "ตกลง"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-node     - แสดงรายชื่อnodesที่มีอยู่ขณะใช้--parallel \n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "คำอธิบาย hdlist ไม่ถูกต้อง \"%s\" ในไฟล์ hdlists"
-
-#: ../urpme:1 ../urpmi:1
-#, fuzzy, c-format
-msgid "removing %s"
-msgstr "ไม่สามารถที่จะลบแพ็คเกจ %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - แสดงรายชื่อ parallel aliases.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - แยกส่วน headers จากแพ็คเกจซึ่งแสดงไว้ในรายการของ urpmi db "
+"ไปยัง\n"
+"                   stdout (เฉพาะรูทเท่านั้น).\n"
 
-#: ../urpmf:1
-#, fuzzy, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr " --size         - พิมพ์ขนาด tag:ขนาด"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --โค้ด      - ให้โค้ดของแพ็คเกจก่อนดาวน์โหลด (เฉพาะรูทเท่านั้น).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"การติดตั้ง Package แบบอัตโนมัต...\n"
-"คุณได้เลือกที่จะติดตั้ง Package %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr " --all          - พิมพ์ tag ทั้งหมด"
+
+#: ../urpmq:77
 #, c-format
-msgid "urpmi database locked"
-msgstr "ฐานข้อมูล urpmi ถูกล็อก"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ขยายการค้นหาให้รวมถึงความเป็นอิสระของโปรแกรม\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
+#: ../urpmq:78
+#, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
-"                   (--no-verify-rpm disable it, default is enabled)\n"
+"  -u             - ทำการลบแพ็คเกจทิ้งถ้าเวอร์ชั่นล่าสุดได้รับการติดตั้งลงในเครื่องแล้ว\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, fuzzy, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "กำลังอ่านคำอธิบายไฟล์ของ \"%s\"..."
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "                  command line แต่ไม่มีชื่อ package)"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - reverse search to what requires package.\n"
+
+#: ../urpmq:85
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - พิมพ์กลุ่มพร้อมชื่อ\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - พิมพ์เวอร์ชั่นกับรีลีสพร้อมชื่อ\n"
+
+#: ../urpmq:89
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - ค้นหาแบบไม่เจาะจง(เช่นเดียวกับ -y).\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จากคำสั่งที่พิมพ์กำลังถูกค้นหา\n"
 
-#: ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - ทำการลบแพ็คเกจทิ้งถ้าเวอร์ชั่นล่าสุดได้รับการติดตั้งลงในเครื่องแล้ว\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes can only be used with --parallel"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:327
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "wget หายไป\n"
+msgid "No filelist found\n"
+msgstr "ไม่พบรายการสำหรับมีเดีย"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:398
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"การใช้: urpmi.update [options] <name> ...\n"
-"โดยที่ <name> เป็นชื่อของอุปกรณ์ที่ต้องการอัพเดต\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "หนึ่งใน Packages ต่อไปนี้ต้องมีในการจะติดตั้ง %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "webfetch %s ไม่รู้จัก !!!\n"
@@ -2061,9 +2107,6 @@ msgstr "  --test         - ตรวจสอบว่าการติดต�
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "try urpmf --help มีทางช่วยให้เลือกมาก"
 
-#~ msgid "no full media list was found"
-#~ msgstr "ไม่พบรายการสำหรับมีเดีย"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "กำลังคัดลอกรายการโค้ดของ \"%s\""
 
diff --git a/po/tl.po b/po/tl.po
index f07b3a10..376c027a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tl-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-05 17:24+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -35,2031 +35,2077 @@ msgstr "OoYy"
 msgid "Nn"
 msgstr "HhNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "ini-install ang %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - automatic na gawin lahat ng media mula sa isang "
-"installation\n"
-"                   medium.\n"
+"Automatic na pag-i-install ng mga package...\n"
+"Hiniling mo na i-install ang package na %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "hindi mabuksan ang rpmdb"
+msgid "Is this OK?"
+msgstr "Ayos ba ito?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - i-print itong tulong na mensahe.\n"
+msgid "Ok"
+msgstr "Ayos"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Isa sa mga sumusunod na package ay kailangan para i-install ang %s:"
+msgid "Cancel"
+msgstr "I-cancel"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "inaalis ang package na %s"
+msgid " (Y/n) "
+msgstr " (O/h) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: command hindi nahanap\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Hindi magamit ang parallel mode kasama ang use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"paggamit: %s [mga_option]\n"
+"kung saan ang [mga_option] ay mula sa\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Lahat ay naka-install na"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - i-print itong tulong na mensahe.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - linisin ang headers cache directory.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - i-restrict ang mga resulta sa binigay na group.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "ginagamit ang proseso na %d para sa pagpapatupad ng transaksyon"
+msgid "                    defaults is %s.\n"
+msgstr "                    defaults ay %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
+msgid "unknown protocol defined for %s"
+msgstr "hindi kilalang protocol naka-define para sa %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ano ang pili mo? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "walang nahanap na webfetch, mga suportadong webfetch ay: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "nahanap %d header sa cache"
+msgid "unable to handle protocol: %s"
+msgstr "hindi ma-handle ang protocol: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "may maramihang package na may parehong pangalan ng rpm file \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "syntax error sa config file sa line %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - banggitin ang user at password na gagamitin para sa "
-"proxy\n"
-"                   authentication (format ay <user:password>).\n"
+"medium \"%s\" ay sumusubok gumamit ng gamit na na hdlist, medium di-pinansin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "nagsasagawa ng pangalawang pagdaan para i-compute ang mga dependency\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"medium \"%s\" ay sumusubok gumamit ng gamit na na list, medium di-pinansin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "kinukuha muli ang rpm file [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"hindi maayos ang medium \"%s\" kasi ang list file ay ginagamit ng ibang "
+"medium"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - ilista ang mga available na parallel alias.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"hindi magamit ang \"%s\" para sa walang pangalang medium dahil ginagamit ito"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...pagkukuha muli nabigo: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"hindi makuha ang medium na \"%s\" sa account dahil walang list file [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "hindi masiyasat ang list file para sa \"%s\", medium di-pinansin"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "hindi malaman ang medium nitong hdlist file [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - binary OR operator, totoo kung isang expression ay "
-"totoo.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "hindi ma-access ang hdlist file ng \"%s\", medium di-pinansin"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Pag-i-install ng package..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "hindi ma-access ang list file ng \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "inbalidong pangalan ng rpm file [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "sinusubukang i-bypass ang mayroon nang medium na \"%s\", iniiwasan"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "masamang pagdeklara ng proxy sa command line\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"virtual medium na \"%s\" ay dapat nag-define ng hdlist o list file, medium "
+"di-pinansin"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transaksyong pag-i-install ay nabigo"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"virtual medium na \"%s\" ay dapat may malinaw na url, medium di-pinansin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"hindi ma-access ang unang installation medium (walang Mandrake/base/hdlists "
-"na file)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "hindi mahanap ang hdlist file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Sorry, masamang pili, subukan muli\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "hindi mahanap ang list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Piliin ang lugar kung saan ise-save ang file"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "incoherent na list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "hindi masiyasat ang list file para sa \"%s\", medium di-pinansin"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "I-install ito"
+msgid "taking removable device as \"%s\""
+msgstr "kinukuha ang naaalis na device bilang \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - gamitin ang X interface.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Isa sa mga sumusunod na package ay kailangan:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "hindi maisulat ang config file [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - piliin ang pinakamabuting interface ayon sa environment:\n"
-"                   X o text mode.\n"
+msgid "write config file [%s]"
+msgstr "isulat ang config file [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Dina-download ang package na `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Hindi magamit ang parallel mode kasama ang use-distrib mode"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Ano ang magagawa sa mga binary rpm file kung ginagamit ang --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select  - piliin kaagad ang mga package para i-upgrade ang "
-"sistema.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "sinusuri ang parallel handler sa file [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "walang package na may pangalang %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "nakahanap ng parallel handler para sa mga node: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - piliin lahat ng katugma sa command line.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "ginagamit ang kasamahang media para sa parallel mode: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Pag-i-install ay nabigo, ilang mga file ay nawawala:\n"
-"%s\n"
-"Baka gusto mong i-update ang iyong urpmi database"
+msgid "unable to use parallel option \"%s\""
+msgstr "hindi magamit ang parallel option na \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"paggamit: urpmi.removemedia [-a] <pangalan> ...\n"
-"kung saan ang <pangalan> ay pangalan ng medium na aalisin.\n"
+"--synthesis ay hindi magagamit kasama ang --media, --excludemedia,--"
+"sortmedia, --update o --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Hindi makapagpatuloy ang pag-i-install dahil ang mga sumusunod na\n"
-"package ay dapat alisin para ma-upgrade ang iba:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "sinusuri ang synthesis file [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "`with' nawawala para sa network media\n"
+msgid "examining hdlist file [%s]"
+msgstr "sinusuri ang hdlist file [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - ilista ang mga file sa package.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "virtual medium na \"%s\" ay hindi local, medium di-pinansin"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "hindi kilalang package"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "problema sa pagbabasa ng hdlist o synthesis file ng medium na \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Pag-i-install ay maaari"
+msgid "performing second pass to compute dependencies\n"
+msgstr "nagsasagawa ng pangalawang pagdaan para i-compute ang mga dependency\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "nilalaktawan ang package na %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
-"package ay ii-install (%d MB)"
+msgid "would install instead of upgrade package %s"
+msgstr "i-install imbis na i-upgrade ang package na %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"hindi makuha ang medium na \"%s\" sa account dahil walang list file [%s]"
+msgid "unable to open rpmdb"
+msgstr "hindi mabuksan ang rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (o/H) "
+msgid "medium \"%s\" already exists"
+msgstr "medium na \"%s\" ay mayroon na"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "hindi maidagdag ang mga update ng distribusyon ng cooker\n"
+msgid "virtual medium need to be local"
+msgstr "virtual medium ay kailangang local"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - masalita na paraan.\n"
+msgid "added medium %s"
+msgstr "idinagdag ang medium na %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Ini-initialize..."
+msgid "unable to access first installation medium"
+msgstr "hindi ma-access ang unang installation medium"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - ilista ang mga available na package.\n"
+msgid "copying hdlists file..."
+msgstr "kinokopya ang hdlists file..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - i-print lahat ng mga tag.\n"
+msgid "...copying failed"
+msgstr "...pagkokopya nabigo"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
+msgid "...copying done"
+msgstr "...pagkokopya natapos"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"virtual medium na \"%s\" ay dapat nag-define ng hdlist o list file, medium "
-"di-pinansin"
+"hindi ma-access ang unang installation medium (walang Mandrake/base/hdlists "
+"na file)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "kino-compute ang md5sum ng nakopyang source hdlist (o synthesis)"
+msgid "retrieving hdlists file..."
+msgstr "kinukuha muli ang hdlists file..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - huwag isama ang path na hiniwalay ng comma/kuwit.\n"
+msgid "...retrieving done"
+msgstr "...pagkukuha muli natapos"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Pindutin ang Enter kung handa na..."
+msgid "...retrieving failed: %s"
+msgstr "...pagkukuha muli nabigo: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"mga hindi kilalang option '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hindi balidong paglalarawan ng hdlist na \"%s\" sa hdlists file"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - hatiin sa maliliit na transaksyon kung mas marami sa "
-"binigay\n"
-"                   na mga package ay ii-install o ia-upgrade,\n"
-"                   default ay %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "problema sa pagbabasa ng hdlist o synthesis file ng medium na \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "pumipili ng maramihang media: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - gamitin ang wget para kunin ang mga malayong file.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "removing medium \"%s\""
+msgstr "inaalis ang medium na \"%s\""
+
+#: ../urpm.pm:943
+#, c-format
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  -p             - payagang maghanap sa provides para hanapin ang package.\n"
+"hindi ma-access ang medium na \"%s\",\n"
+"ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
+"ang medium."
 
-#: ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --list-nodes   - ilista ang mga available node kung ginagamit ang --"
-"parallel.\n"
+"virtual medium na \"%s\" ay dapat may balidong source hdlist o synthesis, "
+"medium di-pinansin"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "binubuo ang hdlist [%s]"
+msgid "copying description file of \"%s\"..."
+msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - ingatan ang mga package na mayroon na, tanggihan\n"
-"                   ang mga hiniling na package kung magkakaroon ng aalisin.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "kino-compute ang md5sum ng mayroong source hdlist (o synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "sinusuri ang MD5SUM file"
 
-#: ../_irpm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: command hindi nahanap\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "kinokopya ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to register rpm file"
-msgstr "hindi mairehistro ang rpm file"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - payagan ang pagtanong sa user na i-install ang mga "
-"package\n"
-"                   na hindi sinusuri ang mga dependency.\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "kino-compute ang md5sum ng nakopyang source hdlist (o synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "hindi ma-handle ang protocol: %s"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "kinukuha muli ang hdlists file..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "Yes, really install it"
-msgstr "Oo, talagang i-install ito"
+msgid "reading rpm files from [%s]"
+msgstr "binabasa ang mga rpm file mula sa [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "added medium %s"
-msgstr "idinagdag ang medium na %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "hindi mabasa ang mga rpm file mula sa [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ingatan ang rpm na hindi ginagamit sa cache.\n"
+msgid "no rpm files found from [%s]"
+msgstr "walang nahanap na rpm file mula sa [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
-"i-upgrade=%d)"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
+#, c-format
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
+
+#: ../urpm.pm:1396
+#, c-format
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
+
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum di-tugma"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "syntax error sa config file sa line %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "pagkuha muli ng source hdlist (o synthesis) nabigo"
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-"  ang mga pangalan o rpm file na binigay sa command line ay ii-install.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - gamitin ang binanggit na HTTP proxy, ang bilang ng port "
-"ay\n"
-"                   ipinagpalagay na 1080 bilang default\n"
-"                   (format ay <proxyhost[:port]>).\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "file na [%s] ay ginagamit na sa parehong medium na \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "in order to install %s"
-msgstr "para ma-install ang %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "hindi ma-parse ang hdlist file ng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "nilipat ang %s entry sa depslist"
+msgid "unable to write list file of \"%s\""
+msgstr "hindi maisulat ang list file ng \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
-"                   pattern o parisan.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "isinusulat ang list file para sa medium na \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
+msgid "nothing written in list file for \"%s\""
+msgstr "walang naisulat sa list file para sa \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "i-install imbis na i-upgrade ang package na %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "sinusuri ang pubkey file ng \"%s\"..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "kinukuha ang mga mirror sa %s ..."
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - i-print ang tag url: url.\n"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "hindi ma-import ang pubkey file ng \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "hindi kilalang protocol naka-define para sa %s"
+msgid "reading headers from medium \"%s\""
+msgstr "binabasa ang mga header mula sa medium na \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr ""
-"  -r             - i-print ang version at release na may pangalan din.\n"
+msgid "building hdlist [%s]"
+msgstr "binubuo ang hdlist [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "medium na \"%s\" ay mayroon na"
+msgid "found %d headers in cache"
+msgstr "nahanap %d header sa cache"
 
-#: ../_irpm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "installing %s\n"
-msgstr "ini-install ang %s\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "inaalis ang %d obsolete na header sa cache"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ang entry na ia-update ay nawawala\n"
-"(isa sa mga %s)\n"
+msgid "mounting %s"
+msgstr "mina-mount ang %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "sinusubukang i-promote ang %s"
+msgid "unmounting %s"
+msgstr "ina-unmount ang %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "unable to remove package %s"
-msgstr "hindi maalis ang package na %s"
+msgid "relocated %s entries in depslist"
+msgstr "nilipat ang %s entry sa depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
+msgid "no entries relocated in depslist"
+msgstr "walang nilipat na entry sa depslist"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"ang entry na aalisin ay nawawala\n"
-"(isa sa mga %s)\n"
+msgid "invalid rpm file name [%s]"
+msgstr "inbalidong pangalan ng rpm file [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - piliin lahat ng media.\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "kinukuha muli ang rpm file [%s] ..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Nawawalang signature (%s)"
+msgid "unable to access rpm file [%s]"
+msgstr "hindi ma-access ang rpm file [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "hindi mabasa ang mga rpm file mula sa [%s]: %s"
+msgid "unable to register rpm file"
+msgstr "hindi mairehistro ang rpm file"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - distributed/nakapamahagi na urpmi sa mga makina ng "
-"alias.\n"
+msgid "error registering local packages"
+msgstr "error sa pagrerehistro ng mga local package"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
+msgid "no package named %s"
+msgstr "walang package na may pangalang %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - i-update ang update media lamang.\n"
+msgid "The following packages contain %s: %s"
+msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid " (Y/n) "
-msgstr " (O/h) "
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "may maramihang package na may parehong pangalan ng rpm file \"%s\""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - i-restrict ang mga resulta sa binigay na group.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "hindi ma-parse ng tama ang [%s] sa halaga na \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"medium \"%s\" ay sumusubok gumamit ng gamit na na list, medium di-pinansin"
+"medium na \"%s\" ay gumagamit ng inbalidong list file:\n"
+"  siguro hindi na-update ang mirror, sinusubukang gamitin ang alternatibong "
+"paraan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "sirang anyo ng input: [%s]"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr ""
+"medium na \"%s\" ay hindi nagde-define ng lokasyon para sa mga rpm file"
 
-#: ../urpme:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
+msgid "package %s is not found."
+msgstr "package na %s ay hindi nahanap."
 
-#: ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - ilista ang mga available na media.\n"
+msgid "urpmi database locked"
+msgstr "urpmi database ay naka-lock"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Ilang package na hiniling ay hindi ma-install:\n"
-"%s"
+msgid "medium \"%s\" is not selected"
+msgstr "medium na \"%s\" ay hindi nakapili"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Ini-install ang package na `%s' (%s/%s)..."
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "hindi mabasa ang rpm file na [%s] mula sa medium na \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "walang nilipat na entry sa depslist"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - i-install ang source package lamang (walang mga binary).\n"
+msgid "unable to access medium \"%s\""
+msgstr "hindi ma-access ang medium na \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - gamitin ang curl para kunin ang mga malayong file.\n"
+msgid "malformed input: [%s]"
+msgstr "sirang anyo ng input: [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "do you agree ?"
-msgstr "sumasang-ayon ka ba?"
+msgid "Preparing..."
+msgstr "Naghahanda..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "incoherent na list file para sa \"%s\", medium di-pinansin"
+msgid "using process %d for executing transaction"
+msgstr "ginagamit ang proseso na %d para sa pagpapatupad ng transaksyon"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "...retrieving done"
-msgstr "...pagkukuha muli natapos"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"gumawa ng transaksyon para sa pag-i-install sa %s (alisin=%d, i-install=%d, "
+"i-upgrade=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "idinadagdag ang package na %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "unable to create transaction"
+msgstr "hindi magawa ang transaksyon"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "skipping package %s"
-msgstr "nilalaktawan ang package na %s"
+msgid "removing package %s"
+msgstr "inaalis ang package na %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Inbalidong signature (%s)"
+msgid "unable to remove package %s"
+msgstr "hindi maalis ang package na %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-"  ang mga pangalan o rpm file na binigay sa command line ay tatanungin.\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "idinadagdag ang package na %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
+msgid "unable to install package %s"
+msgstr "hindi ma-install ang package na %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "hindi ma-parse ng tama ang [%s] sa halaga na \"%s\""
+msgid "due to missing %s"
+msgstr "dahil sa nawawalang %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
+msgid "due to unsatisfied %s"
+msgstr "dahil sa hindi na-satisfy na %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "hindi malaman ang medium nitong hdlist file [%s]"
+msgid "trying to promote %s"
+msgstr "sinusubukang i-promote ang %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "hindi ma-parse ang hdlist file ng \"%s\""
+msgid "in order to keep %s"
+msgstr "para maitago ang %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"medium \"%s\" ay sumusubok gumamit ng gamit na na hdlist, medium di-pinansin"
+msgid "in order to install %s"
+msgstr "para ma-install ang %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "dahil sa pagkakasalungat sa %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "inaalis ang %d obsolete na header sa cache"
+msgid "unrequested"
+msgstr "hindi hiniling"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "hindi ma-update ang medium na \"%s\"\n"
+msgid "Invalid signature (%s)"
+msgstr "Inbalidong signature (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
+msgid "Invalid Key ID (%s)"
+msgstr "Inbalidong Key ID (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "virtual medium na \"%s\" ay hindi local, medium di-pinansin"
+msgid "Missing signature (%s)"
+msgstr "Nawawalang signature (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "Naghahanda..."
+msgid "bad proxy declaration on command line\n"
+msgstr "masamang pagdeklara ng proxy sa command line\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    defaults ay %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Sorry, masamang pili, subukan muli\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --no-probe     - huwag subukang maghanap ng synthesis o hdlist file.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P             - huwag maghanap sa provides para hanapin ang package.\n"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - i-print itong tulong na mensahe.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - automatic na pumili ng package sa mga pagpipilian.\n"
 
-#: ../urpmq:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
-"distrib\n"
-"                   tree. Ito ay magpapahintulot na tanungin ang distro.\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - subukan kung makakamit ng tama ang pag-i-install.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"paggamit: %s [mga_option]\n"
-"kung saan ang [mga_option] ay mula sa\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - alisin ang rpm sa cache bago pa ang kung ano.\n"
+"  --force        - pilitin ang imbokasyon kahit na wala ang ilang mga "
+"package.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"hindi magamit ang \"%s\" para sa walang pangalang medium dahil ginagamit ito"
+"  --parallel     - distributed/nakapamahagi na urpmi sa mga makina ng "
+"alias.\n"
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
-"  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
+"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"virtual medium na \"%s\" ay dapat may balidong source hdlist o synthesis, "
-"medium di-pinansin"
+"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
+"distrib\n"
+"                   tree, magagamit para sa mag-(un)install ng chroot na may\n"
+"                   option na --root.\n"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - masalita na paraan.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"paggamit: urpmi.addmedia [mga_option] <pangalan> <url> [with "
-"<relative_path>]\n"
-"kung saan ang <url> ay isa sa mga\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename ng "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename ng hdlist>\n"
-"       http://<host>/<path> with <relative filename ng hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"at ang [mga_option] ay mula sa\n"
+"  -a             - piliin lahat ng package na tumutugma sa expression.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "kinokopya ang source hdlist (o synthesis) ng \"%s\"..."
+msgid "unknown packages"
+msgstr "hindi kilalang mga package"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...pagkokopya natapos"
+msgid "unknown package"
+msgstr "hindi kilalang package"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "hindi magamit ang parallel option na \"%s\""
+msgid "removing package %s will break your system"
+msgstr "ang pag-aalis ng package na %s ay sisira ng sistema mo"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"medium na \"%s\" ay gumagamit ng inbalidong list file:\n"
-"  siguro hindi na-update ang mirror, sinusubukang gamitin ang alternatibong "
-"paraan"
+msgid "Nothing to remove"
+msgstr "Walang maaalis"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "hindi ma-access ang unang installation medium"
+msgid "Checking to remove the following packages"
+msgstr "Nagsusuri para alisin ang mga sumusunod na package"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "virtual medium ay kailangang local"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "error sa pagrerehistro ng mga local package"
+msgid " (y/N) "
+msgstr " (o/H) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limitahan ang tulin ng pagda-download.\n"
+msgid "removing %s"
+msgstr "inaalis ang %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
+msgid "Removing failed"
+msgstr "Pag-aalis nabigo"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "pagkuha muli ng source hdlist (o synthesis) nabigo"
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "walang nahanap na rpm file mula sa [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gamitin lang ang update media.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "walang naisulat sa list file para sa \"%s\""
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - gamitin lang ang binigay na media, hiniwilay ng comma/"
+"kuwit.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Ang mga sumusunod na package ay may masamang signature"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "kino-compute ang md5sum ng mayroong source hdlist (o synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+"  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
+"kuwit.\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kompletong output kasama ang package na aalisin.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
+"database.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "hindi ma-install ang package na %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - masalita na paraan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - payagan ang pagtanong sa user na i-install ang mga "
-"package\n"
-"                   na hindi sinusuri ang mga dependency at integridad.\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Save file"
-msgstr "I-save ang file"
+"  --quiet        - huwag i-print ang pangalan ng tag (default kung walang\n"
+"                   binigay na tag sa command line, hindi kasundo ang\n"
+"                   interactive na mode o paraan).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "hindi maisulat ang config file [%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - i-print lahat ng mga tag.\n"
 
-#: ../urpme:1
+#: ../urpmf:43
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - piliin lahat ng package na tumutugma sa expression.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - i-print ang tag group: grupo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Inbalidong Key ID (%s)"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - i-print ang tag size: laki.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:45
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - pilitin ang imbokasyon kahit na wala ang ilang mga "
-"package.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:46
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - subukang hanapin at gamitin ang synthesis file.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
 
-#: ../urpmi:1
+#: ../urpmf:48
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
-"database.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:49
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - pilitin ang pag-update ng gpg key.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<relative path ng hdlist> ay nawawala\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Nagsusuri para alisin ang mga sumusunod na package"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - i-print ang tag url: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "hindi hiniling"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "hindi ma-access ang rpm file [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - i-print ang tag files: lahat ng file.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
-
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Gusto mong ituloy ang pag-i-install ?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+"  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "hindi mabasa ang rpm file na [%s] mula sa medium na \"%s\""
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
-"distrib\n"
-"                   tree, magagamit para sa mag-install ng chroot na may\n"
-"                   option na --root.\n"
+"  --env          - gumamit ng specific na environment o kapaligiran "
+"(karaniwan\n"
+"                   ay isang ulat sa bug).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
+"                   pattern o parisan.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - mag-print ng kapakipakinabang na inpormasyon sa anyong\n"
-"                   nababasa ng tao.\n"
+"  -f             - i-print ang version, release o labas at arch o "
+"arkitektura\n"
+"                   kasama ang pangalan.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - gamitin ang binanggit na version ng distribusyon, ang\n"
-"                   default ay kukunin sa version ng distribusyon na sinabi "
-"ng\n"
-"                   naka-install na mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - gamitin ang binanggit na URL para sa talaan ng mga "
-"mirror,\n"
-"                   default ay %s\n"
+"  -a             - binary AND operator, totoo kung parehong expression ay "
+"totoo.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
-"distrib\n"
-"                   tree, magagamit para sa mag-(un)install ng chroot na may\n"
-"                   option na --root.\n"
+"  -o             - binary OR operator, totoo kung isang expression ay "
+"totoo.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, totoo kung expression ay hindi totoo.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+"  (              - kaliwang parenthesis para buksan ang grupo ng "
+"expression.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - kanang parenthesis para isara ang grupo ng expression.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Directory na [%s] ay meron na, gumamit ng ibang directory para sa ulat ng "
-"bug o alisin ito"
+"ang callback ay :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "ina-unmount ang %s"
+msgid "using specific environment on %s\n"
+msgstr "ginagamit ang specific environment sa %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% natapos, tulin = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "sinisimulan muli ang urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
+"database.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sinusuri ang synthesis file [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - piliin kaagad ang mga package para i-upgrade ang "
+"sistema.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - huwag itanong kung alisin ang package, huwag magpatuloy.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...pagkokopya nabigo"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - ingatan ang mga package na mayroon na, tanggihan\n"
+"                   ang mga hiniling na package kung magkakaroon ng aalisin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "hindi ma-access ang hdlist file ng \"%s\", medium di-pinansin"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - hatiin sa maliliit na transaksyon kung mas marami sa "
+"binigay\n"
+"                   na mga package ay ii-install o ia-upgrade,\n"
+"                   default ay %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - tahimik na paraan.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - haba ng maliit na transaksyon, default ay %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - masalita na paraan.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - igiit ang fuzzy na paghahanap (pareho ng -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - ibigay lahat ng source package bago i-download (root "
-"lang).\n"
+"  --src          - ang kasunod na package ay source package (pareho ng -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - kunin ang mga header para sa package na nakalista mula "
-"sa\n"
-"                   urpmi database papuntang stdout (root lang).\n"
+"  --install-src  - i-install ang source package lamang (walang mga binary).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "hindi kilalang mga package"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - alisin ang rpm sa cache bago pa ang kung ano.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "pumipili ng maramihang media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ingatan ang rpm na hindi ginagamit sa cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"  -f             - i-print ang version, release o labas at arch o "
-"arkitektura\n"
-"                   kasama ang pangalan.\n"
+"  --allow-nodeps - payagan ang pagtanong sa user na i-install ang mga "
+"package\n"
+"                   na hindi sinusuri ang mga dependency.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "file na [%s] ay ginagamit na sa parehong medium na \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - payagan ang pagtanong sa user na i-install ang mga "
+"package\n"
+"                   na hindi sinusuri ang mga dependency at integridad.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "walang aalisin (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
+"distrib\n"
+"                   tree, magagamit para sa mag-install ng chroot na may\n"
+"                   option na --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "hindi mahanap ang list file para sa \"%s\", medium di-pinansin"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - gamitin ang wget para kunin ang mga malayong file.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - i-print itong tulong na mensahe.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - gamitin ang curl para kunin ang mga malayong file.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "nakahanap ng parallel handler para sa mga node: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limitahan ang tulin ng pagda-download.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"ang callback ay :\n"
-"%s\n"
+"  --resume       - ituloy ang paglipat ng mga na-download nang bahagi ng "
+"file\n"
+"                   (--no-resume ay dini-disable ito, default ay naka-"
+"disable).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -R             - pabaliktad na paghahanap sa kung ano ang nangangailangan "
-"ng\n"
-"                   package.\n"
+"  --proxy        - gamitin ang binanggit na HTTP proxy, ang bilang ng port "
+"ay\n"
+"                   ipinagpalagay na 1080 bilang default\n"
+"                   (format ay <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
+"  --proxy-user   - banggitin ang user at password na gagamitin para sa "
+"proxy\n"
+"                   authentication (format ay <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - huwag i-print ang pangalan ng tag (default kung walang\n"
-"                   binigay na tag sa command line, hindi kasundo ang\n"
-"                   interactive na mode o paraan).\n"
+"  --bug          - maglabas ng ulat ng bug sa directory na binanggit ng\n"
+"                   kasunod na argument.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - gamitin ang X interface.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis ay hindi magagamit kasama ang --media, --excludemedia,--"
-"sortmedia, --update o --parallel"
+"  --best-output  - piliin ang pinakamabuting interface ayon sa environment:\n"
+"                   X o text mode.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - gamitin ang binanggit na arkitektura, ang default ay arch "
-"ng\n"
-"                   mandrake-release package na naka-install.\n"
+"  --verify-rpm   - patotohanan ang rpm signature bago ang pag-i-install\n"
+"                   (--no-verify-rpm ay idi-disable ito, default ay "
+"gumagana).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Ayos ba ito?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - huwag isama ang path na hiniwalay ng comma/kuwit.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - huwag isama ang mga docs file.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - piliin lahat ng katugma sa command line.\n"
+
+#: ../urpmi:128
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
-"database.\n"
+"  -p             - payagang maghanap sa provides para hanapin ang package.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "sinusuri ang parallel handler sa file [%s]"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P             - huwag maghanap sa provides para hanapin ang package.\n"
 
-#: ../urpme:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "Nothing to remove"
-msgstr "Walang maaalis"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr ""
+"  -y             - igiit ang fuzzy na paghahanap (pareho ng --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - ang kasunod na package ay source package (pareho ng --"
+"src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "binabasa ang mga header mula sa medium na \"%s\""
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - tahimik na paraan.\n"
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - ipaabot ang tanong sa package dependencies.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  ang mga pangalan o rpm file na binigay sa command line ay ii-install.\n"
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "Choose location to save file"
+msgstr "Piliin ang lugar kung saan ise-save ang file"
+
+#: ../urpmi:197
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  --bug          - maglabas ng ulat ng bug sa directory na binanggit ng\n"
-"                   kasunod na argument.\n"
+"Ano ang magagawa sa mga binary rpm file kung ginagamit ang --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"medium na \"%s\" ay hindi nagde-define ng lokasyon para sa mga rpm file"
+"Ikaw ay pumili ng source package:\n"
+"\n"
+"%s\n"
+"\n"
+"Ito ay source code (gamit ng programmer) ng katapat nitong software "
+"package.\n"
+"Hindi mo siguro gustong i-install ito sa computer mo (kapag in-install mo "
+"ito,\n"
+"maaari mong baguhin ang source code, i-compile ito, at nabago na ang "
+"software).\n"
+"\n"
+"Ano ang gusto mong gawin?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
+msgid "Do nothing"
+msgstr "Walang gawin"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "hindi maisulat ang list file ng \"%s\""
+msgid "Yes, really install it"
+msgstr "Oo, talagang i-install ito"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
+msgid "Save file"
+msgstr "I-save ang file"
 
-#: ../urpm.pm:1
+#: ../urpmi:225
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Ikaw ay mag-i-install ng sumusunod na software package sa computer mo:\n"
+"\n"
+"%s\n"
+"\n"
+"Pwede mong naising i-save na lang ito. Ano ang pili mo?"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
+msgid "Install it"
+msgstr "I-install ito"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Pagkokopya nabigo"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Directory na [%s] ay meron na, gumamit ng ibang directory para sa ulat ng "
+"bug o alisin ito"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - pilitin ang paggawa ng mga hdlist file.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Hindi magawa ang directory na [%s] para sa ulat ng bug"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
+msgid "Copying failed"
+msgstr "Pagkokopya nabigo"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - ang kasunod na package ay source package (pareho ng --"
-"src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Isa sa mga sumusunod na package ay kailangan:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "ini-install ang %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Ano ang pili mo? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "binabasa ang mga rpm file mula sa [%s]"
+msgid "Package installation..."
+msgstr "Pag-i-install ng package..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
+msgid "Initializing..."
+msgstr "Ini-initialize..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --auto         - automatic na pumili ng package sa mga pagpipilian.\n"
+"Ilang package na hiniling ay hindi ma-install:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Pag-aalis nabigo"
+msgid "do you agree ?"
+msgstr "sumasang-ayon ka ba?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - gumawa ng virtual media na parating naka-update,\n"
-"                   ang file:// protocol lamang ang pinahihintulutan.\n"
+"Hindi makapagpatuloy ang pag-i-install dahil ang mga sumusunod na\n"
+"package ay dapat alisin para ma-upgrade ang iba:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "package na %s ay hindi nahanap."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Ang mga sumusunod na package ay dapat alisin para ma-upgrade ang iba:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "inaalis ang medium na \"%s\""
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
+"package ay ii-install (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
+"Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "I-cancel"
+msgid "unable to get source packages, aborting"
+msgstr "hindi makuha ang mga source package, hindi tumutuloy"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - ang kasunod na package ay source package (pareho ng -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - gumamit ng specific na environment o kapaligiran "
-"(karaniwan\n"
-"                   ay isang ulat sa bug).\n"
+msgid "Press Enter when ready..."
+msgstr "Pindutin ang Enter kung handa na..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
-"kuwit.\n"
+msgid "Downloading package `%s'..."
+msgstr "Dina-download ang package na `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "hindi ma-access ang medium na \"%s\""
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% ng %s natapos, ETA = %s, tulin = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "hindi magawa ang medium na \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% natapos, tulin = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
+msgid "The following packages have bad signatures"
+msgstr "Ang mga sumusunod na package ay may masamang signature"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - i-dump ang config sa anyo na argument ng urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Gusto mong ituloy ang pag-i-install ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Kailangan mong maging root para i-install ang mga sumusunod na dependency:\n"
+"Pag-i-install ay nabigo, ilang mga file ay nawawala:\n"
 "%s\n"
+"Baka gusto mong i-update ang iyong urpmi database"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - i-print ang changelog.\n"
+msgid "Installation failed"
+msgstr "Pag-i-install ay nabigo"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "hindi ma-access ang list file ng \"%s\", medium di-pinansin"
+msgid "distributing %s"
+msgstr "dini-distribute ang %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - kanang parenthesis para isara ang grupo ng expression.\n"
+msgid "installing %s"
+msgstr "ini-install ang %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "walang nahanap na webfetch, mga suportadong webfetch ay: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Ini-install ang package na `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "sinusuri ang hdlist file [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "kinokopya ang hdlists file..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "isinusulat ang list file para sa medium na \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d transaksyong pag-i-install ay nabigo"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"virtual medium na \"%s\" ay dapat may malinaw na url, medium di-pinansin"
+msgid "Installation is possible"
+msgstr "Pag-i-install ay maaari"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "Lahat ay naka-install na"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Walang gawin"
+msgid "restarting urpmi"
+msgstr "sinisimulan muli ang urpmi"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "ginagamit ang kasamahang media para sa parallel mode: %s"
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"paggamit: urpmi.addmedia [mga_option] <pangalan> <url> [with "
+"<relative_path>]\n"
+"kung saan ang <url> ay isa sa mga\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename ng "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename ng hdlist>\n"
+"       http://<host>/<path> with <relative filename ng hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"at ang [mga_option] ay mula sa\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "mina-mount ang %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - gumawa ng update medium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"hindi maayos ang medium \"%s\" kasi ang list file ay ginagamit ng ibang "
-"medium"
+"  --probe-synthesis - subukang hanapin at gamitin ang synthesis file.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "hindi makuha ang mga source package, hindi tumutuloy"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - subukang hanapin at gamitin ang hdlist file.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
-"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
+"  --no-probe     - huwag subukang maghanap ng synthesis o hdlist file.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% ng %s natapos, ETA = %s, tulin = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - automatic na gawin lahat ng media mula sa isang "
+"installation\n"
+"                   medium.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - automatic na gumawa ng medium para sa XXX na bahagi ng\n"
+"                   distribusyon, ang XXX ay maaaring main, contrib, updates "
+"o\n"
+"                   kahit ano na na-configure ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "hindi ma-import ang pubkey file ng \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - gamitin ang binanggit na URL para sa talaan ng mga "
+"mirror,\n"
+"                   default ay %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  --no-uninstall - huwag itanong kung alisin ang package, huwag magpatuloy.\n"
+"  --version      - gamitin ang binanggit na version ng distribusyon, ang\n"
+"                   default ay kukunin sa version ng distribusyon na sinabi "
+"ng\n"
+"                   naka-install na mandrake-release package.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq version %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
+"  --arch         - gamitin ang binanggit na arkitektura, ang default ay arch "
+"ng\n"
+"                   mandrake-release package na naka-install.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - gumawa ng virtual media na parating naka-update,\n"
+"                   ang file:// protocol lamang ang pinahihintulutan.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - i-print ang mga grupo na may pangalan din.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - i-disable ang MD5SUM na pagsusuri ng file.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "medium na \"%s\" ay hindi nakapili"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - linisin ang headers cache directory.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - pilitin ang paggawa ng mga hdlist file.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "ginagamit ang specific environment sa %s\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "hindi maidagdag ang mga update ng distribusyon ng cooker\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "hindi mahanap ang hdlist file para sa \"%s\", medium di-pinansin"
+msgid "retrieving mirrors at %s ..."
+msgstr "kinukuha ang mga mirror sa %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - haba ng maliit na transaksyon, default ay %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - kaliwang parenthesis para buksan ang grupo ng "
-"expression.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "hindi ma-update ang medium na \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
+msgid "<relative path of hdlist> missing\n"
+msgstr "<relative path ng hdlist> ay nawawala\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binary AND operator, totoo kung parehong expression ay "
-"totoo.\n"
+msgid "`with' missing for network media\n"
+msgstr "`with' nawawala para sa network media\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "hindi magawa ang medium na \"%s\"\n"
+
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"hindi ma-access ang medium na \"%s\",\n"
-"ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
-"ang medium."
+"paggamit: urpmi.removemedia [-a] <pangalan> ...\n"
+"kung saan ang <pangalan> ay pangalan ng medium na aalisin.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - i-print ang tag group: grupo.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - piliin lahat ng media.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - gamitin lang ang binigay na media, hiniwilay ng comma/"
-"kuwit.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "hindi magawa ang transaksyon"
+"\n"
+"mga hindi kilalang option '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "walang aalisin (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Ikaw ay pumili ng source package:\n"
-"\n"
-"%s\n"
-"\n"
-"Ito ay source code (gamit ng programmer) ng katapat nitong software "
-"package.\n"
-"Hindi mo siguro gustong i-install ito sa computer mo (kapag in-install mo "
-"ito,\n"
-"maaari mong baguhin ang source code, i-compile ito, at nabago na ang "
-"software).\n"
-"\n"
-"Ano ang gusto mong gawin?"
+"ang entry na aalisin ay nawawala\n"
+"(isa sa mga %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "dini-distribute ang %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"paggamit: urpmi.update [mga_option] <pangalan> ...\n"
+"kung saan ang <pangalan> ay pangalan ng medium na ia-update.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Pag-i-install ay nabigo"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - i-update ang update media lamang.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "isulat ang config file [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - pilitin ang pag-update ng gpg key.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 "  -a             - piliin lahat ng non-removable (hindi naaalis) na media.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - patotohanan ang rpm signature bago ang pag-i-install\n"
-"                   (--no-verify-rpm ay idi-disable ito, default ay "
-"gumagana).\n"
+"ang entry na ia-update ay nawawala\n"
+"(isa sa mga %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - ilista ang mga available na package.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - gumawa ng update medium.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - ilista ang mga available na media.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - ilista ang mga available na media at kanilang URL.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
-"  -y             - igiit ang fuzzy na paghahanap (pareho ng --fuzzy).\n"
+"  --dump-config  - i-dump ang config sa anyo na argument ng urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Ayos"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - ilista ang mga available node kung ginagamit ang --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hindi balidong paglalarawan ng hdlist na \"%s\" sa hdlists file"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - ilista ang mga available na parallel alias.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "inaalis ang %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - kunin ang mga header para sa package na nakalista mula "
+"sa\n"
+"                   urpmi database papuntang stdout (root lang).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - automatic na gumawa ng medium para sa XXX na bahagi ng\n"
-"                   distribusyon, ang XXX ay maaaring main, contrib, updates "
-"o\n"
-"                   kahit ano na na-configure ;-)\n"
+"  --sources      - ibigay lahat ng source package bago i-download (root "
+"lang).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - i-print ang tag size: laki.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
+"distrib\n"
+"                   tree. Ito ay magpapahintulot na tanungin ang distro.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "para maitago ang %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - i-print ang changelog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "dahil sa hindi na-satisfy na %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - ipaabot ang tanong sa package dependencies.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Automatic na pag-i-install ng mga package...\n"
-"Hiniling mo na i-install ang package na %s\n"
+"  -u             - alisin ang package kung may mas bagong version na\n"
+"                   naka-install.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi database ay naka-lock"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kompletong output kasama ang package na aalisin.\n"
 
-#: ../urpmi:1
+#: ../urpmq:82
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --resume       - ituloy ang paglipat ng mga na-download nang bahagi ng "
-"file\n"
-"                   (--no-resume ay dini-disable ito, default ay naka-"
-"disable).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "sinusuri ang pubkey file ng \"%s\"..."
+"  -R             - pabaliktad na paghahanap sa kung ano ang nangangailangan "
+"ng\n"
+"                   package.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - i-disable ang MD5SUM na pagsusuri ng file.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - mag-print ng kapakipakinabang na inpormasyon sa anyong\n"
+"                   nababasa ng tao.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "kinukuha ang naaalis na device bilang \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - i-print ang mga grupo na may pangalan din.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
-"Ikaw ay mag-i-install ng sumusunod na software package sa computer mo:\n"
-"\n"
-"%s\n"
-"\n"
-"Pwede mong naising i-save na lang ito. Ano ang pili mo?"
+"  -r             - i-print ang version at release na may pangalan din.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - igiit ang fuzzy na paghahanap (pareho ng -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - ilista ang mga file sa package.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  -u             - alisin ang package kung may mas bagong version na\n"
-"                   naka-install.\n"
+"  ang mga pangalan o rpm file na binigay sa command line ay tatanungin.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - subukang hanapin at gamitin ang hdlist file.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "dahil sa nawawalang %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gamitin lang ang update media.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"paggamit: urpmi.update [mga_option] <pangalan> ...\n"
-"kung saan ang <pangalan> ay pangalan ng medium na ia-update.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "sinusubukang i-bypass ang mayroon nang medium na \"%s\", iniiwasan"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Isa sa mga sumusunod na package ay kailangan para i-install ang %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - subukan kung makakamit ng tama ang pag-i-install.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq version %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "paggamit:\n"
diff --git a/po/tr.po b/po/tr.po
index 5e61bab1..ade7ba54 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-01-26 05:48+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <mandrakei18n@yahoogroups.com>\n"
@@ -44,853 +44,760 @@ msgstr "EeYy"
 msgid "Nn"
 msgstr "HhNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s kuruluyor\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - tüm medyaları otomatik olarak bir kurulum medyasından\n"
-"                   oluştur.\n"
+"Otomatik paket kurulumu...\n"
+"%s paketinin kurulmasını istemiştiniz.\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb açılamıyor"
+msgid "Is this OK?"
+msgstr "Tamam mı?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - bu yardım mesajını görüntüler.\n"
+msgid "Ok"
+msgstr "Tamam"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s kurulumu için aşağıdaki paketlerin biri gerekli:"
+msgid "Cancel"
+msgstr "İptal"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s paketi kaldırılıyor"
+msgid " (Y/n) "
+msgstr " (E/h) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: komut bulunamadı\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "herşey zaten kurulu"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - bu yardım mesajını görüntüler.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - grup etiketini yaz: grup.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -a             - tüm ortamları seçer.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr ""
-"  -c             - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s için bilinmeyen protokol tanımlanmış"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
+msgid "unable to handle protocol: %s"
+msgstr "%s protokolü ile ilgilenemiyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Seçiminiz? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "yapılandırma dosyasının %s satırında sözdizimi hatası"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "arabellekte %d başlığı bulundu"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - vekil sunucu kimlik denetimi için kullanıcı adı\n"
-"                   ve parola belirtin (biçim <kullanıcıadı:parola>).\n"
+"liste dosyası başka ortam tarafından kullanıldığından \"%s\" ile "
+"çalışılamıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "kullanımda olduğundan isimsiz ortam için \"%s\" ismi kullanılamıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "Rpm dosyası [%s] getiriliyor..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "\"%s\" ortamı, liste dosyası [%s] olmadığından hesap içine alınamıyor"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases   - mevcut parelel alias'lari listele.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "hdlist dosyasının [%s] ortamı saptanamıyor"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...getirme başarısız: [%s]"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası denetlenemiyor, ortam yoksayıldı"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - ikili OR operatör, ifadelerden biri doğru ise doğru.\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "Package installation..."
-msgstr "Paket kurulumu..."
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "rpm dosya ismi [%s] geçersiz"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "komut satırından kötü vekil sunucu bildirimi\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "\"%s\" için sabit disk listesi dosyası bulunamıyor, ortam yoksayıldı"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "%d installation transactions failed"
-msgstr ""
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"İlk kurulum ortamına erişilemiyor ( Mandrake/base/hdlists dosyası bulunamadı)"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası tutarsız, ortam yoksayıldı"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Üzgünüm ,hatalı seçim, tekrar deneyin\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "\"%s\" için liste dosyası denetlenemiyor, ortam yoksayıldı"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "too many mount points for removable medium \"%s\""
+msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
 
-#: ../urpmf:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - özet etiketini yaz: özet..\n"
+msgid "taking removable device as \"%s\""
+msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:347
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Bu paketler %s içeriyor: %s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Kurulum başarısız oldu"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "Farklı %s çıkarılabilir aygıtları %s için  kullanılıyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X arayüzünü kullan.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
+msgid "unable to write config file [%s]"
+msgstr "yapılandırma dosyasına [%s] yazılamıyor"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
-"gerekiyor (%d Mb)"
+msgid "write config file [%s]"
+msgstr "yapılandırma dosyası [%s] yazılıyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
-"  -best-output   - işlem için en iyi arayüzü seç : \n"
-"                   X veya metin kipi.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "'%s' paketi indiriliyor..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"--install-src özelliği binary rpm dosyaları kullanılırken neyi halleder"
+msgid "examining parallel handler in file [%s]"
+msgstr "\"%s\" dosyasındaki paralel işleyici inceleniyor"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - Sistemi güncellemek için paketleri otomatik seç.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "düğümler için paralel işleyici bulundu: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "%s adında bir paket yok"
+msgid "using associated media for parallel mode: %s"
+msgstr "paralel mod için ortak ortam kullanılıyor: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - komut satırındakilere uyanların tümünü seçer. \n"
+msgid "unable to use parallel option \"%s\""
+msgstr "paralel seçenek \"%s\" kullanılamadı"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Kurulum başarısızlıkla sonuçlandı. Bazı dosyalar kayıp:\n"
-"%s\n"
-"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"kullanımı: urpmi.removemedia [-a] <isim> ...\n"
-"  <isim>      kaldırılacak ortamın ismidir.\n"
+msgid "examining synthesis file [%s]"
+msgstr "sentez dosyası [%s] inceleniyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Kurulum devam edemez çünkü diğer paketlerin güncellenmesi\n"
-"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "bilinmeyen paket"
+msgid "performing second pass to compute dependencies\n"
+msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Kurulum Başarılı"
+msgid "skipping package %s"
+msgstr "%s paketi atlanıyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
-"gerekiyor:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "would install instead of upgrade package %s"
 msgstr ""
-"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin de kurulması "
-"gerekiyor (%d Mb)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "\"%s\" ortamı, liste dosyası [%s] olmadığından hesap içine alınamıyor"
+msgid "unable to open rpmdb"
+msgstr "rpmdb açılamıyor"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " ( y, e / H , N ) "
+msgid "medium \"%s\" already exists"
+msgstr "\"%s\" ortamı zaten var"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "cooker dağıtımı güncellemeleri eklenemiyor\n"
+msgid "virtual medium need to be local"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - kalabalık kipi.\n"
+msgid "added medium %s"
+msgstr "%s ortamı eklendi"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Hazırlanıyor..."
+msgid "unable to access first installation medium"
+msgstr "İlk kurulum ortamına erişilemiyor"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list           - tüm paketleri göster\n"
+msgid "copying hdlists file..."
+msgstr "hdlist dosyaları kopyalanıyor..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - tüm etiketler yazır.\n"
+msgid "...copying failed"
+msgstr "...kopyalama başarısız"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
+msgid "...copying done"
+msgstr "...kopyalama tamamlandı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
+"İlk kurulum ortamına erişilemiyor ( Mandrake/base/hdlists dosyası bulunamadı)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
+msgid "retrieving hdlists file..."
+msgstr "hard disk rpm listesi (hdlists) alınıyor..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - virgül ile ayrılmış yolları dahil etme.\n"
+msgid "...retrieving done"
+msgstr "...ele alma tamamlandı"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Hazır olduğunuzda Enter'a basın..."
+msgid "...retrieving failed: %s"
+msgstr "...getirme başarısız: [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"bilinmeyen seçenek '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "sabit disk listesi dosyasındaki sabit disk açıklaması %s geçersiz"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr ""
+msgid "selecting multiple media: %s"
+msgstr "Çoklu medya seçiliyor: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - uzaktaki dosyaları almak için wget kullan.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
+msgid "removing medium \"%s\""
+msgstr "aygıt kaldırılıyor \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes   - --parallel kullanırken erişilebilir düğümleri listele.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "sabit disk listesi [%s] oluşturuluyor"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1004
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+msgid "copying description file of \"%s\"..."
+msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
+
+#: ../urpm.pm:1027 ../urpm.pm:1267
+#, c-format
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "MD5SUM dosyası sınanıyor"
 
-#: ../_irpm:1
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: komut bulunamadı\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "unable to register rpm file"
-msgstr "rpm dosyası kayıt edilemiyor"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
-"  --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n"
-"                   izin verir.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "%s protokolü ile ilgilenemiyor"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "hard disk rpm listesi (hdlists) alınıyor..."
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "[%s] kopyalaması başarısız"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "Yes, really install it"
-msgstr ""
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "added medium %s"
-msgstr "%s ortamı eklendi"
+msgid "reading rpm files from [%s]"
+msgstr "rpm dosyaları [%s]'den okunuyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - rpm'yi ön bellekte kullanılmadan sakla\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s]'den rpm dosyaları okunamadı: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "no rpm files found from [%s]"
+msgstr "[%s] de rpm dosyaları yok"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "md5sum mismatch"
-msgstr ""
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "yapılandırma dosyasının %s satırında sözdizimi hatası"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "incelenmiş hdlist (yada sentez) %s olarak bulundu"
 
-#: ../urpmi:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"  komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1398
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "md5sum mismatch"
 msgstr ""
-"  --proxy        - belirli HTTP vekil sunucusu kullan, port numarası\n"
-"                   varsayılan olan 1080 kabul edilecek (biçim <vekilsunucu[:"
-"port]>).\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "in order to install %s"
-msgstr "sıradaki kurulum %s"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "bağımlılıklar listesindeki %s girdileri yeniden konumlandırıldı"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
 
-#: ../urpmf:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "%s dosyası %s ortamında zaten kullanılmış"
 
-#: ../urpmi:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "%s dizini hata raporu için oluşturulamıyor"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr ""
+msgid "unable to write list file of \"%s\""
+msgstr "\"%s\" liste dosyası yazılamıyor"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "\"%s\" adresinden yansılar getiriliyor..."
+msgid "writing list file for medium \"%s\""
+msgstr "\"%s\" için listesi dosyası yazılıyor"
 
-#: ../urpmf:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\" için liste dosyasına hiçbir şey yazılmamış"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s için bilinmeyen protokol tanımlanmış"
+msgid "examining pubkey file of \"%s\"..."
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - isminin yanıda sürüm numarasını da yazar.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "\"%s\" ortamı zaten var"
+msgid "reading headers from medium \"%s\""
+msgstr "\"%s\" ortamından başlıklar okunuyor"
 
-#: ../_irpm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "installing %s\n"
-msgstr "%s kuruluyor\n"
+msgid "building hdlist [%s]"
+msgstr "sabit disk listesi [%s] oluşturuluyor"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Güncelleme için girdi eksik\n"
-"(bunlardan biri %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "trying to promote %s"
-msgstr ""
+msgid "found %d headers in cache"
+msgstr "arabellekte %d başlığı bulundu"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paket kalırılamıyor: %s"
+msgid "removing %d obsolete headers in cache"
+msgstr "arabellekteki %d eski başlık kaldırılıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
+msgid "mounting %s"
+msgstr "%s bağlanıyor"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"Silme için girdi eksik\n"
-"(bunlardan biri %s)\n"
+msgid "unmounting %s"
+msgstr "%s ayrılıyor"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - tüm ortamları seçer.\n"
+msgid "relocated %s entries in depslist"
+msgstr "bağımlılıklar listesindeki %s girdileri yeniden konumlandırıldı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "Missing signature (%s)"
-msgstr ""
+msgid "no entries relocated in depslist"
+msgstr "bağımlılıklar listesindeki hiç bir giriş yeniden konumlanamadı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s]'den rpm dosyaları okunamadı: %s"
+msgid "invalid rpm file name [%s]"
+msgstr "rpm dosya ismi [%s] geçersiz"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - dağıtık urpmi (accross machines of alias).\n"
+msgid "retrieving rpm file [%s] ..."
+msgstr "Rpm dosyası [%s] getiriliyor..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "unable to access rpm file [%s]"
+msgstr "rpm dosyasına [%s] erişilemiyor"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - sadece güncelleme medyasını güncelle.\n"
+msgid "unable to register rpm file"
+msgstr "rpm dosyası kayıt edilemiyor"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid " (Y/n) "
-msgstr " (E/h) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - grup etiketini yaz: grup.\n"
+msgid "error registering local packages"
+msgstr "yerel paketlerin sicil kaydı yapılırken hata"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
+msgid "no package named %s"
+msgstr "%s adında bir paket yok"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "bozuk girdi: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Bu paketler %s içeriyor: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "%s paketinin kaldırılması sisteminizi göçertir"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - mevcut medyaları göster\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "'%s' paketi kuruluyor ( %s/%s )..."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "no entries relocated in depslist"
-msgstr "bağımlılıklar listesindeki hiç bir giriş yeniden konumlanamadı"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "ortam \"%s\" rpm dosyaları için herhangi bir yer belirtmiyor"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - sadece kaynak kodu paketlerini kur (binaryleri değil).\n"
+msgid "package %s is not found."
+msgstr "%s paketi bulunamadı."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - uzak dosyaları almak için curl kullan.\n"
+msgid "urpmi database locked"
+msgstr "urpmi veri tabanı kilitlendi"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl kocunu doğrudan perl olarak ekle -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "\"%s\" seçilmedi"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "kabul ediyor musunuz ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası tutarsız, ortam yoksayıldı"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"tutarsız ortam \"%s\" kaldırılabilir olarak imlenmiş ama bu doğru değil"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...ele alma tamamlandı"
+msgid "unable to access medium \"%s\""
+msgstr "\"%s\" ortamına erişilemiyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr ""
+msgid "malformed input: [%s]"
+msgstr "bozuk girdi: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "%s paketi atlanıyor"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Geçersiz imza (%s)"
+msgid "Preparing..."
+msgstr "Hazırlanıyor..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "using process %d for executing transaction"
 msgstr ""
-"  komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"urpmi sürüm %s\n"
-"TelifHakkı (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
-"kullanım:\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "hdlist dosyasının [%s] ortamı saptanamıyor"
+msgid "removing package %s"
+msgstr "%s paketi kaldırılıyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
+msgid "unable to remove package %s"
+msgstr "paket kalırılamıyor: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
-"\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "%s paketi ile çelişkisinden"
+msgid "unable to install package %s"
+msgstr "%s paketi yüklenemiyor"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "arabellekteki %d eski başlık kaldırılıyor"
+msgid "due to missing %s"
+msgstr "%s paketinin kayıplığından"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "\"%s\" güncellenemiyor\n"
+msgid "due to unsatisfied %s"
+msgstr "%s' den dolayı yetersiz"
 
-#: ../urpmi:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
+msgid "trying to promote %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "Preparing..."
-msgstr "Hazırlanıyor..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -a             - tüm ortamları seçer.\n"
+msgid "in order to install %s"
+msgstr "sıradaki kurulum %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "Farklı %s çıkarılabilir aygıtları %s için  kullanılıyor"
+msgid "due to conflicts with %s"
+msgstr "%s paketi ile çelişkisinden"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
+msgid "unrequested"
+msgstr "talep edilmemiş"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
-"  -P           - sağlanan paketlerin arasında paketi bulmak için arama "
-"yapma.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "[%s] kopyalaması başarısız"
+msgid "Invalid signature (%s)"
+msgstr "Geçersiz imza (%s)"
 
-#: ../urpmq:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Geçersiz Anahtar ID'si (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3094
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - herhangi birşeyden önce rpm'yi önbellekten sil.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "kullanımda olduğundan isimsiz ortam için \"%s\" ismi kullanılamıyor"
+msgid "bad proxy declaration on command line\n"
+msgstr "komut satırından kötü vekil sunucu bildirimi\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
+msgid "Sorry, bad choice, try again\n"
+msgstr "Üzgünüm ,hatalı seçim, tekrar deneyin\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -906,1054 +813,1193 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"kullanım: urpmi.addmedia [seçenekler] <isim> <url> [with <göreli_yol>]\n"
-"<url> şunlardan biri:\n"
-"       file://<yol>\n"
-"       ftp://<kullanıcıadı>:<parola>@<bilgisayar>/<yol> with <hdlistin "
-"göreli dosya ismi>\n"
-"       ftp://<bilgisyar>/<yol> with <hdlistin göreli dosya ismi>\n"
-"       http://<bilgisayar>/<yol> with <hdlistin göreli dosya ismi>\n"
-"       removable://<yol>\n"
-"\n"
-"ve [seçenekler] de şunlardan biridir:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - bu yardım mesajını görüntüler.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "...copying done"
-msgstr "...kopyalama tamamlandı"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "paralel seçenek \"%s\" kullanılamadı"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
+"  --force        - bazı paketlerin bulunamama durumda bile işlemin\n"
+"                   devamına zorla.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "İlk kurulum ortamına erişilemiyor"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - dağıtık urpmi (accross machines of alias).\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
-msgstr "yerel paketlerin sicil kaydı yapılırken hata"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - indirme hızını kısıtlama.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - kalabalık kipi.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "incelenmiş hdlist (yada sentez) %s olarak bulundu"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
+msgid "unknown packages"
+msgstr "bilinmeyen paketler "
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] de rpm dosyaları yok"
+msgid "unknown package"
+msgstr "bilinmeyen paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\" için liste dosyasına hiçbir şey yazılmamış"
+msgid "removing package %s will break your system"
+msgstr "%s paketinin kaldırılması sisteminizi göçertir"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Sonraki paketler hatalı imza içeriyor"
+msgid "Nothing to remove"
+msgstr "Kaldırılacak bir şey yok"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "Checking to remove the following packages"
+msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
+
+#: ../urpme:106
+#, c-format
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
+"gerekiyor (%d Mb)"
 
-#: ../urpmq:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - kaldırılacak paketlerin toplu çıktısı.\n"
+msgid " (y/N) "
+msgstr " ( y, e / H , N ) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s paketi yüklenemiyor"
+msgid "removing %s"
+msgstr "%s kaldırılıyor"
 
-#: ../urpmi:1
+#: ../urpme:115
 #, c-format
+msgid "Removing failed"
+msgstr "Kaldırma başarısız"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  --allow-force  - kullanıcıya bağımlılıkları ve diğer olumsuzlukları\n"
-"                   sormadan kuruluma izin verir.\n"
+"urpmf sürüm %s\n"
+"TelifHakkı (C) 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"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - sadece güncelleme ortamını kullan.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
+"  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "yapılandırma dosyasına [%s] yazılamıyor"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi veritabanı yerine verilen bireşimi kullan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Geçersiz Anahtar ID'si (%s)"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose             - kalabalık kipi.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --force        - bazı paketlerin bulunamama durumda bile işlemin\n"
-"                   devamına zorla.\n"
+"  --quiet          etiket isimlerini göstermez (etiket girilmediği sürece ön "
+"tanımlıdır\n"
+"                   satır, etkileşimli durum ile uyumlu değil).\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - tüm etiketler yazır.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - grup etiketini yaz: grup.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - boyut etiketini yaz: boyut.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist'in göreli dosyaismi> eksik\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - tarih etiketini yaz: tarih.\n"
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - özet etiketini yaz: özet..\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr "talep edilmemiş"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - açıklama etiketini yaz: açıklama.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "rpm dosyasına [%s] erişilemiyor"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Yüklemeye devam etmek istiyor musunuz ?"
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "rpm dosyası [%s] \"%s\" ortamından okunamıyor"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
+msgid "  --files        - print tag files: all files.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr ""
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --version      - belirtilen dağıtım sürümünü kullan, öntanımlı olan\n"
-"                   kurulu bulunan mandrake sürüm paketi tarafından\n"
-"                   belirtilen sürümdür.\n"
+"  --env          - belirli bir çevre kullan (genellikle bir\n"
+"                   hata raporu).\n"
+
+#: ../urpmf:59
+#, c-format
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr ""
+"  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
+
+#: ../urpmf:60 ../urpmq:88
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - isminin yanında sürüm ve kurnazlığını yazar.\n"
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl kocunu doğrudan perl olarak ekle -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - yansı adreslerini almak için belirtilen adresi kullan,\n"
-"                   öntanımlı adres: %s\n"
+"  -a             - ikili AND operatörü, her iki ifade de doğru ise doğru.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - ikili OR operatör, ifadelerden biri doğru ise doğru.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - tekli NOT, ifade yanlış ise doğru.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - grup ifadesini açmak için sol parantez.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - grup ifadesini kapatmak için sağ parantez.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
+"gelidönüş :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "%s ayrılıyor"
+msgid "using specific environment on %s\n"
+msgstr "%s' de belirtilen ortam kullanılıyor\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
-"Güncellenecek hiç birşey yok\n"
-"(yeni ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% tamamlandı, hız = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi sürüm %s\n"
+"TelifHakkı (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
+"kullanım:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
+"  --synthesis    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "sentez dosyası [%s] inceleniyor"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - Sistemi güncellemek için paketleri otomatik seç.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...kopyalama başarısız"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - Sessiz kipi.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - kalabalık kipi.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy         - hatalı aramaya zorla (-y ile aynı)\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - İndirmeye başlamadan önce tüm kaynak paketleri yolla.\n"
-"                   (Sadece root için geçerlidir).\n"
+"  --src          -  ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - urpmi veritabanında listelenen paketler için başlıkları\n"
-"                   standart çıktıya(monitör) aç(yönlendir)(sadece root "
-"için)\n"
+"  --install-src  - sadece kaynak kodu paketlerini kur (binaryleri değil).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "bilinmeyen paketler "
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - herhangi birşeyden önce rpm'yi önbellekten sil.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "Çoklu medya seçiliyor: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - rpm'yi ön bellekte kullanılmadan sakla\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - isminin yanında sürüm ve kurnazlığını yazar.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - kullanıcıya bağımlılıkları sormadan kuruluma\n"
+"                   izin verir.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "%s dosyası %s ortamında zaten kullanılmış"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - kullanıcıya bağımlılıkları ve diğer olumsuzlukları\n"
+"                   sormadan kuruluma izin verir.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
-"Kaldırılacak bir şey yok\n"
-"(yeni bir ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - uzaktaki dosyaları almak için wget kullan.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - bu yardım mesajını görüntüler.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - uzak dosyaları almak için curl kullan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "düğümler için paralel işleyici bulundu: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - indirme hızını kısıtlama.\n"
 
-#: ../urpmf:1
-#, c-format
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"gelidönüş :\n"
-"%s\n"
+"  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
+"                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - gerekli paketler için ters arama.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - belirli HTTP vekil sunucusu kullan, port numarası\n"
+"                   varsayılan olan 1080 kabul edilecek (biçim <vekilsunucu[:"
+"port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf sürüm %s\n"
-"TelifHakkı (C) 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"
+"  --proxy-user   - vekil sunucu kimlik denetimi için kullanıcı adı\n"
+"                   ve parola belirtin (biçim <kullanıcıadı:parola>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet          etiket isimlerini göstermez (etiket girilmediği sürece ön "
-"tanımlıdır\n"
-"                   satır, etkileşimli durum ile uyumlu değil).\n"
+"  --bug          - sonraki argüman tarafından belirtilen dizini bir\n"
+"                   hata raporu oluştur.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr ""
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X arayüzünü kullan.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
+"  -best-output   - işlem için en iyi arayüzü seç : \n"
+"                   X veya metin kipi.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - belirtilen mimariyi kullan, öntanımlı olan \n"
-"                   kurulmuş mandrake-sürüm paketi.\n"
+"  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
+"                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Tamam mı?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - virgül ile ayrılmış yolları dahil etme.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi veritabanı yerine verilen bireşimi kullan.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - komut satırındakilere uyanların tümünü seçer. \n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "\"%s\" dosyasındaki paralel işleyici inceleniyor"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - paketi bulmak için aramaya izin ver.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Kaldırılacak bir şey yok"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr ""
+"  -P           - sağlanan paketlerin arasında paketi bulmak için arama "
+"yapma.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - hatalı aramayı uygulamaya koy ( --fuzzy ile aynı)\n"
+
+#: ../urpmi:131 ../urpmq:84
+#, c-format
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
+"  -s             - bir sonraki paket bir kaynak paketi(--src ile aynı).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "\"%s\" ortamından başlıklar okunuyor"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - Sessiz kipi.\n"
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - paket bağımlılıkları için sorguyu genişlet.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr ""
+"  komut satırından isimleri veya rpm dosyaları verilenler yüklenecek.\n"
 
-#: ../urpmi:1
+#: ../urpmi:141
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "Choose location to save file"
 msgstr ""
-"  --bug          - sonraki argüman tarafından belirtilen dizini bir\n"
-"                   hata raporu oluştur.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "ortam \"%s\" rpm dosyaları için herhangi bir yer belirtmiyor"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"--install-src özelliği binary rpm dosyaları kullanılırken neyi halleder"
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "\"%s\" liste dosyası yazılamıyor"
+msgid "Do nothing"
+msgstr "Birşey yapma"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "Save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - açıklama etiketini yaz: açıklama.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Kurulum başarısız oldu"
+
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Kopyalama başarısız"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f              - hdlist dosyalarını oluşum için zorla.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "%s dizini hata raporu için oluşturulamıyor"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes sadece --parallel ile kullanılabilir"
+msgid "Copying failed"
+msgstr "Kopyalama başarısız"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
+msgid "Only superuser is allowed to install packages"
+msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - bir sonraki paket bir kaynak paketi(--src ile aynı).\n"
+msgid "One of the following packages is needed:"
+msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "%s kuruluyor"
+msgid "What is your choice? (1-%d) "
+msgstr "Seçiminiz? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "rpm dosyaları [%s]'den okunuyor"
+msgid "Package installation..."
+msgstr "Paket kurulumu..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
+msgid "Initializing..."
+msgstr "Hazırlanıyor..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Kaldırma başarısız"
+msgid "do you agree ?"
+msgstr "kabul ediyor musunuz ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
+"Kurulum devam edemez çünkü diğer paketlerin güncellenmesi\n"
+"için aşağıdaki paketlerin kaldırılması gerekiyor:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "%s paketi bulunamadı."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Diğer paketlerin güncellenmesi için aşağıdaki paketlerin kaldırılması "
+"gerekiyor:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "aygıt kaldırılıyor \"%s\""
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin de kurulması "
+"gerekiyor (%d Mb)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "<hdlist'in göreceli konumu> --distrib ile gerekli değil "
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Aşağıdaki bağımlılıkların yüklenebilmesi için root olmalısınız:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "İptal"
+msgid "unable to get source packages, aborting"
+msgstr "kaynak paketleri alınamadı, çıkılıyor"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          -  ardından gelen paket bir kaynak paketi ( -s ile aynı).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Lütfen \"%s\" isimli ortamı [%s] aygıtına yerleştirin"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - belirli bir çevre kullan (genellikle bir\n"
-"                   hata raporu).\n"
+msgid "Press Enter when ready..."
+msgstr "Hazır olduğunuzda Enter'a basın..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
+msgid "Downloading package `%s'..."
+msgstr "'%s' paketi indiriliyor..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "\"%s\" ortamına erişilemiyor"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%%'nin %s'i tamamlandı, Kalan Süre = %s, Hız = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "\"%s\" oluşturulamıyor\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% tamamlandı, hız = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr ""
+msgid "The following packages have bad signatures"
+msgstr "Sonraki paketler hatalı imza içeriyor"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "Do you want to continue installation ?"
+msgstr "Yüklemeye devam etmek istiyor musunuz ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Aşağıdaki bağımlılıkların yüklenebilmesi için root olmalısınız:\n"
+"Kurulum başarısızlıkla sonuçlandı. Bazı dosyalar kayıp:\n"
 "%s\n"
+"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
 
-#: ../urpmq:1
-#, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr ""
-
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
+msgid "Installation failed"
+msgstr "Kurulum başarısız oldu"
 
-#: ../urpmf:1
+#: ../urpmi:665
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - grup ifadesini kapatmak için sağ parantez.\n"
+msgid "distributing %s"
+msgstr "%s dağıtılıyor"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "installing %s"
+msgstr "%s kuruluyor"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "'%s' paketi kuruluyor ( %s/%s )..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlist dosyaları kopyalanıyor..."
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "\"%s\" için listesi dosyası yazılıyor"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:780
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr ""
+msgid "Installation is possible"
+msgstr "Kurulum Başarılı"
 
-#: ../urpmi:1
+#: ../urpmi:783
 #, c-format
-msgid "Do nothing"
-msgstr "Birşey yapma"
+msgid "Everything already installed"
+msgstr "herşey zaten kurulu"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "paralel mod için ortak ortam kullanılıyor: %s"
+msgid "restarting urpmi"
+msgstr ""
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"kullanım: urpmi.addmedia [seçenekler] <isim> <url> [with <göreli_yol>]\n"
+"<url> şunlardan biri:\n"
+"       file://<yol>\n"
+"       ftp://<kullanıcıadı>:<parola>@<bilgisayar>/<yol> with <hdlistin "
+"göreli dosya ismi>\n"
+"       ftp://<bilgisyar>/<yol> with <hdlistin göreli dosya ismi>\n"
+"       http://<bilgisayar>/<yol> with <hdlistin göreli dosya ismi>\n"
+"       removable://<yol>\n"
+"\n"
+"ve [seçenekler] de şunlardan biridir:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "%s bağlanıyor"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - güncelleme ortamı oluştur.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"liste dosyası başka ortam tarafından kullanıldığından \"%s\" ile "
-"çalışılamıyor"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "kaynak paketleri alınamadı, çıkılıyor"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%%'nin %s'i tamamlandı, Kalan Süre = %s, Hız = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - tüm medyaları otomatik olarak bir kurulum medyasından\n"
+"                   oluştur.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
+"  --distrib-XXX  - XXX dağıtımı için bir ortam oluşturur,\n"
+"                   XXX değeri main, contrib, updates yada\n"
+"                   atanmış herhangi başka bir değer alabilir ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
+"  --from         - yansı adreslerini almak için belirtilen adresi kullan,\n"
+"                   öntanımlı adres: %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
+"  --version      - belirtilen dağıtım sürümünü kullan, öntanımlı olan\n"
+"                   kurulu bulunan mandrake sürüm paketi tarafından\n"
+"                   belirtilen sürümdür.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\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"
+"  --arch         - belirtilen mimariyi kullan, öntanımlı olan \n"
+"                   kurulmuş mandrake-sürüm paketi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - isminin yanında grupları da yazar.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "\"%s\" seçilmedi"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr ""
+"  -c             - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f              - hdlist dosyalarını oluşum için zorla.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s' de belirtilen ortam kullanılıyor\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "cooker dağıtımı güncellemeleri eklenemiyor\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "\"%s\" için sabit disk listesi dosyası bulunamıyor, ortam yoksayıldı"
+msgid "retrieving mirrors at %s ..."
+msgstr "\"%s\" adresinden yansılar getiriliyor..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "<hdlist'in göreceli konumu> --distrib ile gerekli değil "
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - grup ifadesini açmak için sol parantez.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "\"%s\" güncellenemiyor\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist'in göreli dosyaismi> eksik\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
-"  -a             - ikili AND operatörü, her iki ifade de doğru ise doğru.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "\"%s\" oluşturulamıyor\n"
+
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
+"kullanımı: urpmi.removemedia [-a] <isim> ...\n"
+"  <isim>      kaldırılacak ortamın ismidir.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - grup etiketini yaz: grup.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - tüm ortamları seçer.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media       - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
+"\n"
+"bilinmeyen seçenek '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "unable to create transaction"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"Kaldırılacak bir şey yok\n"
+"(yeni bir ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
-
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"Silme için girdi eksik\n"
+"(bunlardan biri %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "%s dağıtılıyor"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"kullanımı: urpmi.update [seçenekler] <isim> ...\n"
+"  <isim>      güncellenecek medyanın ismidir.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Kurulum başarısız oldu"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - sadece güncelleme medyasını güncelle.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "yapılandırma dosyası [%s] yazılıyor"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - tüm kaldırılamaz medyaları seçer.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - tarih etiketini yaz: tarih.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"Güncellenecek hiç birşey yok\n"
+"(yeni ortam eklemek için \"urpmi.addmedia\" kullanın)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
-"                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
+"Güncelleme için girdi eksik\n"
+"(bunlardan biri %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf sürüm %s\n"
+"TelifHakkı (C) 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"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Lütfen \"%s\" isimli ortamı [%s] aygıtına yerleştirin"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list           - tüm paketleri göster\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - güncelleme ortamı oluştur.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - mevcut medyaları göster\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - hatalı aramayı uygulamaya koy ( --fuzzy ile aynı)\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Tamam"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes   - --parallel kullanırken erişilebilir düğümleri listele.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "sabit disk listesi dosyasındaki sabit disk açıklaması %s geçersiz"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases   - mevcut parelel alias'lari listele.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "%s kaldırılıyor"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - urpmi veritabanında listelenen paketler için başlıkları\n"
+"                   standart çıktıya(monitör) aç(yönlendir)(sadece root "
+"için)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - XXX dağıtımı için bir ortam oluşturur,\n"
-"                   XXX değeri main, contrib, updates yada\n"
-"                   atanmış herhangi başka bir değer alabilir ;-)\n"
+"  --sources      - İndirmeye başlamadan önce tüm kaynak paketleri yolla.\n"
+"                   (Sadece root için geçerlidir).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - boyut etiketini yaz: boyut.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s' den dolayı yetersiz"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - paket bağımlılıkları için sorguyu genişlet.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"Otomatik paket kurulumu...\n"
-"%s paketinin kurulmasını istemiştiniz.\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - daha güncel bir sürümü yüklü ise paketi kaldır.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi veri tabanı kilitlendi"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - kaldırılacak paketlerin toplu çıktısı.\n"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
-"                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
+#: ../urpmq:82
+#, c-format
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - gerekli paketler için ters arama.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:86
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - isminin yanında grupları da yazar.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:87
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - isminin yanıda sürüm numarasını da yazar.\n"
 
-#: ../urpmi:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy         - hatalı aramaya zorla (-y ile aynı)\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
+"  komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
 
-#: ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - daha güncel bir sürümü yüklü ise paketi kaldır.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes sadece --parallel ile kullanılabilir"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:327
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "due to missing %s"
-msgstr "%s paketinin kayıplığından"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - sadece güncelleme ortamını kullan.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "ortam listesinin tamamı bulunamadı"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"kullanımı: urpmi.update [seçenekler] <isim> ...\n"
-"  <isim>      güncellenecek medyanın ismidir.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s kurulumu için aşağıdaki paketlerin biri gerekli:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Bilinmeyen webfetch `%s' !!!\n"
@@ -2112,6 +2158,3 @@ msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\
 
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "Ayrıntılı bilgi için 'urpmf --help' yazınız"
-
-#~ msgid "no full media list was found"
-#~ msgstr "ortam listesinin tamamı bulunamadı"
diff --git a/po/uk.po b/po/uk.po
index 1105dcec..8f353fda 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-11 14:08+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-05-09 12:16+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -36,878 +36,785 @@ msgstr "ТтYy"
 msgid "Nn"
 msgstr "НнNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "встановлюється %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - автоматично створювати всі носії із носія встановлення.\n"
+"Автоматичне встановлення пакунків...\n"
+"Ви замовили встановлення пакунка %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "неможливо відкрити rpmdb"
+msgid "Is this OK?"
+msgstr "Вірно?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - виводити цю довідку.\n"
+msgid "Ok"
+msgstr "Гаразд"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Один з наступних пакунків потрібен для встановлення %s:"
+msgid "Cancel"
+msgstr "Скасувати"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "вилучається пакунок %s"
+msgid " (Y/n) "
+msgstr " (Y/n) (Т/н) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: команди не знайдено\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Неможливо використовувати паралельний режим з режимом use-distrib"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"використання: %s [параметри]\n"
+"де [параметри] - з\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Все вже встановлено"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - виводити цю довідку.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - очищувати теку заголовків кешу.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - обмежити результати для вибраної групи.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "процес %d використовується для виконання транзакції"
+msgid "                    defaults is %s.\n"
+msgstr "                    типово %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - виводити параметр provides: всі використання.\n"
+msgid "unknown protocol defined for %s"
+msgstr "для %s вказано невідомий протокол"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ваш вибір? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "не знайдено webfetch, підтримуються такі webfetch: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "знайдено %d заголовків у кеші"
+msgid "unable to handle protocol: %s"
+msgstr "неможливо обробити протокол: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "існує декілька пакунків з однаковою назвою rpm-файла \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "синтаксична помилка в конфігураційному файлі в рядку %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user    - задати користувача і пароль, щоб використовувати\n"
-"для ідентифікації через проксі (формат - <user:password>).\n"
+"носій \"%s\" намагається використати hdlist, що вже використовується, носія "
+"проігноровано"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "здійснюється другий прохід обрахунку залежностей\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"носій \"%s\" намагається використати список, що вже використовується, носія "
+"проігноровано"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "відновлення rpm-файла [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"неможливо переглянути носія \"%s\", оскільки файл списку вже "
+"використовується іншим носієм"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - вивести список доступних паралельних псевдонімів.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"неможливо використати назву \"%s\" для неназваного носія, бо вона вже "
+"використовується"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...відновлення невдале: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"неможливо взяти носія \"%s\" в облік, оскільки файла списку [%s] не існує"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "неможливо перевірити файл списку для \"%s\", носія проігноровано"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "неможливо визначити носія цього hdlist файла [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - двійковий оператор OR, повертає істина (true), якщо вираз "
-"правдивий.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "неможливо доступитися до файла hdlist \"%s\", носія проігноровано"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Встановлюється пакунок..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "неможливо доступитися до файла списку \"%s\", носія проігноровано"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "неправильна назва rpm-файла [%s]"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "спроба обійти існуючого носія \"%s\", обхід"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "невірне оголошення проксі в командному рядку\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"віртуальний носій \"%s\" не повинен мати заданих файлів hdlist або list,"
+"носія проігноровано"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d запит на встановлення завершився неуспішно"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"віртуальний носій \"%s\" повинен мати повне посилання (url), носія "
+"проігноровано"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr ""
-"немає доступу до першого носія встановлення (немає файла Mandrake/base/"
-"hdlists)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "неможливо знайти файл hdlist для \"%s\", носія проігноровано"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Вибачте, невірний вибір, спробуйте ще раз\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "неможливо знайти файл списку для \"%s\", носія проігноровано"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr "Виберіть місце для збереження файла"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "незв'язний файл списку для \"%s\", носія проігноровано"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - виводити параметр summary: короткий звіт.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "неможливо перевірити файл списку для \"%s\", носія проігноровано"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Наступні пакунки містять %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "забагато точок монтування для змінного носія \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Install it"
-msgstr "Встановити його"
+msgid "taking removable device as \"%s\""
+msgstr "отримується змінний пристрій як \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - використовувати X інтерфейс.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "використовується інший змінний пристрій [%s] для \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Потрібен один із наступних пакунків:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "неможливо відновити шлях до змінного носія \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Щоб задовольнити залежності, наступні пакунки буде вилучено (%d МБ)"
+msgid "unable to write config file [%s]"
+msgstr "неможливо записати конфігураційний файл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - вибрати найкращий інтерфейс відповідно до оточення:\n"
-"                   X або текстовий режим.\n"
+msgid "write config file [%s]"
+msgstr "записати конфігураційний файл [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Звантажується пакунок %s"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Неможливо використовувати паралельний режим з режимом use-distrib"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Що може бути зроблено з двійковими файлами rpm при використанні --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "неможливо проаналізувати \"%s\" у файлі [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr ""
-"  --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "перевіряється паралельний обробник у файлі [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "немає пакунку з назвою %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "знайдено паралельний обробник для вузлів: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - вибрати всі відповідності в командному рядку.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "використовуються зв'язані носії для паралельного режиму: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Інсталяція невдала, деякі файли відсутні:\n"
-"%s\n"
-"Можливо, Вам потрібно поновити вашу базу даних urpmi"
+msgid "unable to use parallel option \"%s\""
+msgstr "неможливо використати паралельну опцію \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"використання: urpmi.removemedia [-a] <назва> ...\n"
-"де <назва> - це назва носія для вилучення.\n"
+"--synthesis не може використовуватися з --media, --excludemedia, --"
+"sortmedia, --update або --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Продовження встановлення неможливе через те, що наступні пакунки повинні "
-"бути вилучені для того, щоб поновити інші:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "перевіряється файл synthesis [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "'with' відсутній для джерела з мережі\n"
+msgid "examining hdlist file [%s]"
+msgstr "перевіряється файл hdlist [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l         - вивести список файлів у пакунку.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "віртуальний носій \"%s\" не є локальним, носія проігноровано"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "невідомий пакунок"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "проблема читання файла hdlist або synthesis для носія \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Встановлення можливе"
+msgid "performing second pass to compute dependencies\n"
+msgstr "здійснюється другий прохід обрахунку залежностей\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "пропускається пакунок %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Наступні %d пакунків буде встановлено для того, щоб задовольнити залежності "
-"(%d МБ)"
+msgid "would install instead of upgrade package %s"
+msgstr "буде встановлено замість поновлення пакунка %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"неможливо взяти носія \"%s\" в облік, оскільки файла списку [%s] не існує"
+msgid "unable to open rpmdb"
+msgstr "неможливо відкрити rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (Т/н) "
+msgid "medium \"%s\" already exists"
+msgstr "носій \"%s\" вже існує"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "неможливо додати поновлення дистрибутиву cooker\n"
+msgid "virtual medium need to be local"
+msgstr "віртуальний носій повинен бути локальним"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - детальний режим.\n"
+msgid "added medium %s"
+msgstr "додано носія %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Ініціалізується..."
+msgid "unable to access first installation medium"
+msgstr "немає доступу до першого носія встановлення"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - вивести список доступних пакунків.\n"
+msgid "copying hdlists file..."
+msgstr "копіюється файл hdlists..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - виводити всі параметри.\n"
+msgid "...copying failed"
+msgstr "...копіювання невдале"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "невідомого носія \"%s\" позначено як змінного, але він не є таким"
+msgid "...copying done"
+msgstr "...копіювання завершено"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"віртуальний носій \"%s\" не повинен мати заданих файлів hdlist або list,"
-"носія проігноровано"
+"немає доступу до першого носія встановлення (немає файла Mandrake/base/"
+"hdlists)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"розраховується md5sum для hdlist (або synthesis) для джерела, з якого йде "
-"копіювання"
+msgid "retrieving hdlists file..."
+msgstr "відновлюється файл hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - виключити шлях, відокремлений комою.\n"
+msgid "...retrieving done"
+msgstr "...відновлення завершено"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Натисніть Enter, коли будете готові..."
+msgid "...retrieving failed: %s"
+msgstr "...відновлення невдале: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"невідомі параметри '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "неправильний опис hdlist \"%s\" у файлі hdlists"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - розбивати на малі транзакції, якщо буде встановлюватися\n"
-"                   або поновлюватися більше, ніж задані пакунки,\n"
-"                   типове значення %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "спроба вибрати неіснуючого носія \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "проблема читання файла hdlist або synthesis для носія \"%s\""
+msgid "selecting multiple media: %s"
+msgstr "вибір багатьох носіїв: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - використовувати wget для доступу до віддалених файлів.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - дозволити пошук в provides, щоб знайти пакунок.\n"
+msgid "removing medium \"%s\""
+msgstr "видаляється носій \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --list-nodes     - вивести список доступних вузлів при використанні --"
-"parallel.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "створюється hdlist [%s]"
+"неможливо отримати доступ до носія \"%s\",\n"
+"це може статися, якщо Ви змонтували теку вручну під час створення носія."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - залишити існуючі пакунки, якщо можливо, відкинути "
-"замовлені\n"
-"                   пакунки, які мають вилучатися.\n"
+"віртуальний носій \"%s\" повинен мати правильне джерело hdlist або "
+"synthesis, носія проігноровано"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "перевіряється файл MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "копіюється файл опису \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: команди не знайдено\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "розраховується md5sum для існуючого джерела hdlist (або synthesis)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "неможливо зареєструвати rpm-файл"
+msgid "examining MD5SUM file"
+msgstr "перевіряється файл MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - дозволити користувачеві встановлювати пакунки без "
-"перевірки залежностей.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "копіюється джерело hdlist (або synthesis) \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "неможливо обробити протокол: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "копіювання [%s] завершилось невдало (файл є підозріло малим)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "відновлюється файл hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr ""
+"розраховується md5sum для hdlist (або synthesis) для джерела, з якого йде "
+"копіювання"
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "Так, встановити його"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "копіювання [%s] невдале (не співпадає md5sum)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "додано носія %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "проблема читання файла synthesis для носія \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - зберігати невикористані rpm у кеші.\n"
+msgid "reading rpm files from [%s]"
+msgstr "читаються rpm-файли з [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
-"поновити=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "неможливо прочитати rpm-файли для [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "неправильна md5sum"
+msgid "no rpm files found from [%s]"
+msgstr "не знайдено rpm-файла для [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "синтаксична помилка в конфігураційному файлі в рядку %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "відновлюється джерело hdlist (або synthesis) \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  назви або rpm-файли, задані в командному рядку, буде встановлено.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "знайдено випробуваний hdlist (або synthesis) як %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"  --proxy        - використовувати вказаний HTTP проксі, типово порт 1080 "
-"(формат - <proxyhost[:port]>).\n"
+"розраховується md5sum для hdlist (або synthesis) джерела, що поновлюється"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "для того, щоб встановити %s"
+msgid "md5sum mismatch"
+msgstr "неправильна md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "перенесено %s елементів в depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "поновлення джерела hdlist (або synthesis) невдале"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "немає файла hdlist для носія \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Неможливо створити теку [%s] для звіту про помилку"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "файл [%s] вже використовується в тому ж носії \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "буде встановлено замість поновлення пакунка %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "неможливо проаналізувати файл hdlist для \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "поновлення дзеркал з %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "неможливо створити файл списку для \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - виводити параметр url: адреса.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "записується файл списку для носія \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "для %s вказано невідомий протокол"
+msgid "nothing written in list file for \"%s\""
+msgstr "нічого не записано у файл списку для \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - також виводити версію і випуск з назвою.\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "перевіряється файл ключів з \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...імпортовано ключ %s з файла ключів \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "носій \"%s\" вже існує"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "неможливо імпортувати файл ключів з \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "встановлюється %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "читаються заголовки з носія \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"об'єкта для поновлення немає\n"
-"(один з %s)\n"
+msgid "building hdlist [%s]"
+msgstr "створюється hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "намагаюсь активізувати %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "побудовано hdlist synthesis файл для носія \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "неможливо видалити пакунок %s"
+msgid "found %d headers in cache"
+msgstr "знайдено %d заголовків у кеші"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "проблема читання файла synthesis для носія \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "видаляються %d застарілі заголовки у кеші"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"об'єкта для вилучення немає\n"
-"(один з %s)\n"
+msgid "mounting %s"
+msgstr "монтується %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - вибрати всі носії.\n"
+msgid "unmounting %s"
+msgstr "розмонтовується %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Відсутній підпис (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "перенесено %s елементів в depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "неможливо прочитати rpm-файли для [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "не перенесено жодного елемента в depslist"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - розподілений urpmi поміж машин псевдоніма.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "неправильна назва rpm-файла [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "копіювання [%s] завершилось невдало (файл є підозріло малим)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "відновлення rpm-файла [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - поновити тільки носія з поновленнями.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "немає доступу до rpm-файла [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) (Т/н) "
+msgid "unable to register rpm file"
+msgstr "неможливо зареєструвати rpm-файл"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - обмежити результати для вибраної групи.\n"
+msgid "error registering local packages"
+msgstr "помилка реєстрації пакунків"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"носій \"%s\" намагається використати список, що вже використовується, носія "
-"проігноровано"
+msgid "no package named %s"
+msgstr "немає пакунку з назвою %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "неправильно сформований ввід: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Наступні пакунки містять %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "вилучення пакунка %s пошкодить вашу систему"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "існує декілька пакунків з однаковою назвою rpm-файла \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media - вивести список доступних носіїв.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "неможливо коректно проаналізувати [%s] на значенні \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Деякі із замовлених пакунків неможливо встановити:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Встановлюється пакунок `%s' (%s/%s)..."
+"носій \"%s\" використовує неправильний файл списку: \n"
+"  можливо, дзеркало не діє, спроба використати альтернативний метод"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "не перенесено жодного елемента в depslist"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "носій \"%s\" не вказує на яке-небудь розташування файлів rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - встановити тільки пакунок з вихідними текстами (без "
-"двійкових файлів).\n"
+msgid "package %s is not found."
+msgstr "пакунку %s не знайдено."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr ""
-"  --curl         - використовувати curl для доступу до віддалених файлів.\n"
+msgid "urpmi database locked"
+msgstr "базу даних urpmi блоковано "
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - включати код perl безпосередньо як perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "носія \"%s\" не вибрано"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Ви впевнені?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "неможливо прочитати rpm-файл [%s] з носія \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "незв'язний файл списку для \"%s\", носія проігноровано"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "невідомого носія \"%s\" позначено як змінного, але він не є таким"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...відновлення завершено"
+msgid "unable to access medium \"%s\""
+msgstr "немає доступу до носія \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "додається пакунок %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "malformed input: [%s]"
+msgstr "неправильно сформований ввід: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "пропускається пакунок %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "відновлення rpm-файлів з носія \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Неправильний підпис (%s)"
+msgid "Preparing..."
+msgstr "Підготовка..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  назви або rpm-файли, задані в командному рядку, необхідні.\n"
+msgid "using process %d for executing transaction"
+msgstr "процес %d використовується для виконання транзакції"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"версія urpmi %s\n"
-" Авторські права (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
-"\n"
-"використання:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "неможливо коректно проаналізувати [%s] на значенні \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - не використовувати вказані джерела, розділені комами.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "неможливо визначити носія цього hdlist файла [%s]"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "неможливо проаналізувати файл hdlist для \"%s\""
+"створено транзакцію для встановлення на %s (вилучити=%d, встановити=%d, "
+"поновити=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"носій \"%s\" намагається використати hdlist, що вже використовується, носія "
-"проігноровано"
+msgid "unable to create transaction"
+msgstr "неможливо створити транзакцію"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "через конфлікти з %s"
+msgid "removing package %s"
+msgstr "вилучається пакунок %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "видаляються %d застарілі заголовки у кеші"
+msgid "unable to remove package %s"
+msgstr "неможливо видалити пакунок %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "неможливо поновити носія\"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "додається пакунок %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Спробувати інсталяцію без перевірки залежностей? (y/N) (т/Н) "
+msgid "unable to install package %s"
+msgstr "неможливо встановити пакунок %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "віртуальний носій \"%s\" не є локальним, носія проігноровано"
+msgid "due to missing %s"
+msgstr "через відсутність %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "Підготовка..."
+msgid "due to unsatisfied %s"
+msgstr "через незадоволеність %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    типово %s.\n"
+msgid "trying to promote %s"
+msgstr "намагаюсь активізувати %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "використовується інший змінний пристрій [%s] для \"%s\""
+msgid "in order to keep %s"
+msgstr "для того, щоб встановити %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - не намагатися знайти файли synthesis або\n"
-"                   hdlist.\n"
+msgid "in order to install %s"
+msgstr "для того, щоб встановити %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - не шукати в provides, щоб знайти пакет.\n"
+msgid "due to conflicts with %s"
+msgstr "через конфлікти з %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "копіювання [%s] невдале (не співпадає md5sum)"
+msgid "unrequested"
+msgstr "не замовлено"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - сконфігурувати urpmi на льоту з дерева дистрибутиву.\n"
-"                   Це дозволяє виконувати запити до дистрибутиву.\n"
+msgid "Invalid signature (%s)"
+msgstr "Неправильний підпис (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"використання: %s [параметри]\n"
-"де [параметри] - з\n"
+msgid "Invalid Key ID (%s)"
+msgstr "Неправильний ідентифікатор ключа (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - спочатку видалити rpm з кешу.\n"
+msgid "Missing signature (%s)"
+msgstr "Відсутній підпис (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"неможливо використати назву \"%s\" для неназваного носія, бо вона вже "
-"використовується"
+msgid "bad proxy declaration on command line\n"
+msgstr "невірне оголошення проксі в командному рядку\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - виводити параметр conflicts: всі конфлікти.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"віртуальний носій \"%s\" повинен мати правильне джерело hdlist або "
-"synthesis, носія проігноровано"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Вибачте, невірний вибір, спробуйте ще раз\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -923,1098 +830,1237 @@ msgstr ""
 "\n"
 "використання:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - виводити цю довідку.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматично вибирати пакунок із запропонованих.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"використання: urpmi.addmedia [параметри] <назва> <url> [з "
-"<відносним_шляхом>]\n"
-" де <url> - це один з\n"
-"       file://<шлях>\n"
-"       ftp://<логін>:<пароль>@<хост>/<шлях> з <відносна назва файла hdlist>\n"
-"        ftp://<хост>/<шлях> з <відносна назва файла hdlist>\n"
-"       http://<хост>/<шлях> з <відносна назва файла hdlist>\n"
-"\n"
-"і [параметри] є з\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - перевірити, чи дане встановлення можливе.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "копіюється джерело hdlist (або synthesis) \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - примусово виконати, навіть якщо деяких пакунків не "
+"існує.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...копіювання завершено"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - розподілений urpmi поміж машин псевдоніма.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "неможливо використати паралельну опцію \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - використовувати інший root для встановлення rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"носій \"%s\" використовує неправильний файл списку: \n"
-"  можливо, дзеркало не діє, спроба використати альтернативний метод"
+"  --use-distrib  - сконфігурувати urpmi на льоту з з дерева дистрибутиву, "
+"використовується\n"
+"                   для встановлення (вилучення) chroot з параметром --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "немає доступу до першого носія встановлення"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - детальний режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "віртуальний носій повинен бути локальним"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - вибрати всі пакунки відповідно до розширення.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "помилка реєстрації пакунків"
+msgid "unknown packages"
+msgstr "невідомі пакунки"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate    - обмежити швидкість завантаження.\n"
+msgid "unknown package"
+msgstr "невідомий пакунок"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "знайдено випробуваний hdlist (або synthesis) як %s"
+msgid "removing package %s will break your system"
+msgstr "вилучення пакунка %s пошкодить вашу систему"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "поновлення джерела hdlist (або synthesis) невдале"
+msgid "Nothing to remove"
+msgstr "Нічого вилучати"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "не знайдено rpm-файла для [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Перевіряється можливість вилучення наступних пакунків"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "нічого не записано у файл списку для \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Щоб задовольнити залежності, наступні пакунки буде вилучено (%d МБ)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Наступні пакунки мають неправильні підписи"
+msgid " (y/N) "
+msgstr " (Т/н) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "розраховується md5sum для існуючого джерела hdlist (або synthesis)"
+msgid "removing %s"
+msgstr "вилучається %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - повний вивід даних про пакунок для вилучення.\n"
+msgid "Removing failed"
+msgstr "Видалення невдале"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"версія urpmf %s\n"
+" Авторські права (C) 2002 MandrakeSoft.\n"
+" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
+"\n"
+"використання:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "неможливо встановити пакунок %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - використовування тільки носії з поновленнями.\n"
 
-#: ../urpmi:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - використовувати тільки задані носії, відокремлені комою.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - не використовувати вказані джерела, розділені комами.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force   - дозволити користувачеві встановлювати пакунки без "
-"перевірки залежностей і цілісності.\n"
+"  --sortmedia    - сортувати джерела відповідно до підписів, відділених "
+"комами.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "Зберегти файл"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - використовувати файл synthesis замість бази даних urpmi.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - детальний режим.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "неможливо записати конфігураційний файл [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet        - не виводити параметр name (типове, якщо параметра не\n"
+".................задано в командному рядку, несумісне з діалоговим "
+"режимом).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - вибрати всі пакунки відповідно до розширення.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - не виводити однакові лінії.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Неправильний ідентифікатор ключа (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - виводити всі параметри.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - примусово виконати, навіть якщо деяких пакунків не "
-"існує.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - виводити параметр group: група.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "неможливо відновити шлях до змінного носія \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - виводити параметр size: розмір.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - намагатися знайти і використати файл synthesis.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - виводити параметр epoch: період.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - використовувати вказаний файл synthesis замість бази "
-"даних urpmi.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - виводити параметр summary: короткий звіт.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - виконати поновлення ключа gpg.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - виводити параметр description: опис.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<відносний шлях hdlist> відсутній\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - виводити параметр sourcerpm: джерельний rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Перевіряється можливість вилучення наступних пакунків"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - виводити параметр packager: пакувальник.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "не замовлено"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - виводити параметр buildhost: основний host.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "немає доступу до rpm-файла [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - виводити параметр url: адреса.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - виводити параметр files: всі файли.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - виводити параметр provides: всі використання.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "неможливо проаналізувати \"%s\" у файлі [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - виводити параметр requires: всі вимоги.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ви хочете продовжувати інсталяцію?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - виводити параметр files: всі файли.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "неможливо прочитати rpm-файл [%s] з носія \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - виводити параметр conflicts: всі конфлікти.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - сконфігурувати urpmi на льоту з дерева дистрибутиву, "
-"використовується\n"
-"                   для встановлення chroot з параметром --root.\n"
+"  --env          - використовувати специфічне оточення (звичайно звіт про "
+"помилку).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "побудовано hdlist synthesis файл для носія \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - виводити корисну інформацію в придатному для читання "
-"вигляді.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - вивести версію, випуск і архів з назвою.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - використовувати вказану версію дистрибутиву, типово\n"
-"                   використовується версія дистрибутиву, повідомлена\n"
-"                   встановленим пакунком випуску mandrake.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - включати код perl безпосередньо як perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - використовувати url для списку дзеркал, типове значення\n"
-"                   %s\n"
+"  -a             - двійковий оператор AND, повертає істина, якщо обидва "
+"вирази правдиві.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - сконфігурувати urpmi на льоту з з дерева дистрибутиву, "
-"використовується\n"
-"                   для встановлення (вилучення) chroot з параметром --root.\n"
+"  -o             - двійковий оператор OR, повертає істина (true), якщо вираз "
+"правдивий.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - унарний NOT, повертає істина (true), якщо вираз "
 "неправдивий.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - ліва дужка, щоб відкрити груповий вираз.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - права дужка, щоб закрити груповий вираз.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Тека [%s] вже існує, використайте іншу теку на звіт про помилку або знищіть "
-"його"
+"зворотній виклик:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "розмонтовується %s"
+msgid "using specific environment on %s\n"
+msgstr "використовується особливе оточення на %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        завершено %s%%, швидкість = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"версія urpmi %s\n"
+" Авторські права (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
+"\n"
+"використання:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "перезапуск urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - використовувати вказаний файл synthesis замість бази "
+"даних urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "перевіряється файл synthesis [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - ніколи не запитувати про вилучення пакунка, припиняти "
+"встановлення.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...копіювання невдале"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - залишити існуючі пакунки, якщо можливо, відкинути "
+"замовлені\n"
+"                   пакунки, які мають вилучатися.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "неможливо доступитися до файла hdlist \"%s\", носія проігноровано"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - розбивати на малі транзакції, якщо буде встановлюватися\n"
+"                   або поновлюватися більше, ніж задані пакунки,\n"
+"                   типове значення %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - режим мовчання.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-level  - транзакції малої довжини, типова довжина %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - детальний режим.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - встановити нечіткий пошук (те саме, що -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
-"  --sources      - вивести всі вихідні пакунки перед завантаженням (тільки "
-"root).\n"
+"  --src          - наступний пакунок - це пакунок з вихідними текстами (так "
+"само, як -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - вибрати заголовки для пакунків, перерахованих\n"
-"                          в базі даних urpmi, до stdout (root тільки).\n"
+"  --install-src  - встановити тільки пакунок з вихідними текстами (без "
+"двійкових файлів).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "невідомі пакунки"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - спочатку видалити rpm з кешу.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "вибір багатьох носіїв: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - зберігати невикористані rpm у кеші.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - вивести версію, випуск і архів з назвою.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - дозволити користувачеві встановлювати пакунки без "
+"перевірки залежностей.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "файл [%s] вже використовується в тому ж носії \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force   - дозволити користувачеві встановлювати пакунки без "
+"перевірки залежностей і цілісності.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "нічого вилучати (використовуйте urpmi.addmedia, щоб додати носія)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - сконфігурувати urpmi на льоту з дерева дистрибутиву, "
+"використовується\n"
+"                   для встановлення chroot з параметром --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "неможливо знайти файл списку для \"%s\", носія проігноровано"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr ""
+"  --wget         - використовувати wget для доступу до віддалених файлів.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - виводити цю довідку.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr ""
+"  --curl         - використовувати curl для доступу до віддалених файлів.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "знайдено паралельний обробник для вузлів: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate    - обмежити швидкість завантаження.\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"зворотній виклик:\n"
-"%s\n"
+"  --resume       - відновити переміщення частково звантажених файлів\n"
+"                   (--no-resume вимикає його, типово вимкнено).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - зворотний пошук пакунків.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - використовувати вказаний HTTP проксі, типово порт 1080 "
+"(формат - <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"версія urpmf %s\n"
-" Авторські права (C) 2002 MandrakeSoft.\n"
-" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
-"\n"
-"використання:\n"
+"  --proxy-user    - задати користувача і пароль, щоб використовувати\n"
+"для ідентифікації через проксі (формат - <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - не виводити параметр name (типове, якщо параметра не\n"
-".................задано в командному рядку, несумісне з діалоговим "
-"режимом).\n"
+"  --bug          - вивести звіт про помилку в теку, вказану наступним "
+"аргументом.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - не виводити однакові лінії.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - використовувати X інтерфейс.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis не може використовуватися з --media, --excludemedia, --"
-"sortmedia, --update або --parallel"
+"  --best-output  - вибрати найкращий інтерфейс відповідно до оточення:\n"
+"                   X або текстовий режим.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - використовувати вказану архітектуру, типово\n"
-"                   використовується архітектура встановленого пакунка\n"
-"                   випуску mandrake.\n"
+"  --verify-rpm   - перевірити підпис rpm перед встановленням\n"
+"                   (--no-verify-rpm вимикає це і встановлює типове "
+"значення).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Вірно?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - виключити шлях, відокремлений комою.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - не включати файли документації.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - використовувати файл synthesis замість бази даних urpmi.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "перевіряється паралельний обробник у файлі [%s]"
-
-#: ../urpme:1
-#, c-format
-msgid "Nothing to remove"
-msgstr "Нічого вилучати"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - вибрати всі відповідності в командному рядку.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...імпортовано ключ %s з файла ключів \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - дозволити пошук в provides, щоб знайти пакунок.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "читаються заголовки з носія \"%s\""
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - не шукати в provides, щоб знайти пакет.\n"
 
-#: ../urpmq:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - розширений запит до залежностей пакета.\n"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - задати невизначений пошук (так само як --fuzzy).\n"
 
-#: ../urpmi:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
-"  --bug          - вивести звіт про помилку в теку, вказану наступним "
-"аргументом.\n"
+"  -s             - наступний пакунок є пакунком з джерельними текстами (те "
+"саме, що --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "носій \"%s\" не вказує на яке-небудь розташування файлів rpm"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - режим мовчання.\n"
 
-#: ../urpmf:1
+#: ../urpmi:134
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - виводити параметр sourcerpm: джерельний rpm.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  назви або rpm-файли, задані в командному рядку, буде встановлено.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "неможливо створити файл списку для \"%s\""
+msgid "Choose location to save file"
+msgstr "Виберіть місце для збереження файла"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - виводити параметр requires: всі вимоги.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
+"Що може бути зроблено з двійковими файлами rpm при використанні --install-src"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "спроба вибрати неіснуючого носія \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"Ви вибрали джерельний пакунок:\n"
+"\n"
+"%s\n"
+"\n"
+"Можливо, Ви не хотіли встановлювати його (встановлення його\n"
+"зробить можливим вносити зміни у його вихідний текст і потім компілювати).\n"
+"\n"
+"Що Ви хочете зробити?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - виводити параметр description: опис.\n"
+msgid "Do nothing"
+msgstr "Не робити нічого"
 
-#: ../urpmi:1
+#: ../urpmi:213
 #, c-format
-msgid "Copying failed"
-msgstr "Копіювання невдале"
+msgid "Yes, really install it"
+msgstr "Так, встановити його"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - змушувати генерувати hdlist файли.\n"
+msgid "Save file"
+msgstr "Зберегти файл"
 
-#: ../urpmq:1
+#: ../urpmi:225
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes може використовуватися тільки з --parallel"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"Зараз Ви встановите наступний пакунок програм на свій комп'ютер:\n"
+"\n"
+"%s\n"
+"\n"
+"Можливо, Ви хочете просто зберегти його. Який Ваш вибір?"
 
-#: ../urpm.pm:1
+#: ../urpmi:230
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "немає файла hdlist для носія \"%s\""
+msgid "Install it"
+msgstr "Встановити його"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
-"  -s             - наступний пакунок є пакунком з джерельними текстами (те "
-"саме, що --src).\n"
+"Тека [%s] вже існує, використайте іншу теку на звіт про помилку або знищіть "
+"його"
 
-#: ../urpmi:1
+#: ../urpmi:240
 #, c-format
-msgid "installing %s"
-msgstr "встановлюється %s"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Неможливо створити теку [%s] для звіту про помилку"
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "читаються rpm-файли з [%s]"
+msgid "Copying failed"
+msgstr "Копіювання невдале"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "копіюється файл опису \"%s\"..."
+msgid "Only superuser is allowed to install packages"
+msgstr "Тільки користувачу root дозволяється встановлювати пакунки"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:396
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматично вибирати пакунок із запропонованих.\n"
+msgid "One of the following packages is needed:"
+msgstr "Потрібен один із наступних пакунків:"
 
-#: ../urpme:1
+#: ../urpmi:403
 #, c-format
-msgid "Removing failed"
-msgstr "Видалення невдале"
+msgid "What is your choice? (1-%d) "
+msgstr "Ваш вибір? (1-%d) "
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr ""
-"  --virtual      - створити віртуального носія з найновішими даними,\n"
-"                   дозволяється тільки протокол file:// protocol.\n"
+msgid "Package installation..."
+msgstr "Встановлюється пакунок..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "package %s is not found."
-msgstr "пакунку %s не знайдено."
+msgid "Initializing..."
+msgstr "Ініціалізується..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "видаляється носій \"%s\""
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Деякі із замовлених пакунків неможливо встановити:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "немає потреби задавати <відносний шлях hdlist> з --distrib"
+msgid "do you agree ?"
+msgstr "Ви впевнені?"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "Cancel"
-msgstr "Скасувати"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"Продовження встановлення неможливе через те, що наступні пакунки повинні "
+"бути вилучені для того, щоб поновити інші:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:461
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --src          - наступний пакунок - це пакунок з вихідними текстами (так "
-"само, як -s).\n"
+"Наступні пакунки будуть вилучені для того, щоб поновити інші:\n"
+"%s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
 msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
-"  --env          - використовувати специфічне оточення (звичайно звіт про "
-"помилку).\n"
+"Наступні %d пакунків буде встановлено для того, щоб задовольнити залежності "
+"(%d МБ)"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"  --sortmedia    - сортувати джерела відповідно до підписів, відділених "
-"комами.\n"
+"Вам необхідно мати права root, щоб встановити наступні залежності:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "немає доступу до носія \"%s\""
+msgid "unable to get source packages, aborting"
+msgstr "неможливо одержати початкові пакунки, завершується"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "неможливо створити носія\"%s\"\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Вставте, будь-ласка, носія %s у пристрій %s"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - виводити параметр packager: пакувальник.\n"
+msgid "Press Enter when ready..."
+msgstr "Натисніть Enter, коли будете готові..."
 
-#: ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config - вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
+msgid "Downloading package `%s'..."
+msgstr "Звантажується пакунок %s"
 
-#: ../urpmi:1
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        завершено %s%% з %s, ETA = %s, швидкість = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        завершено %s%%, швидкість = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Наступні пакунки мають неправильні підписи"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ви хочете продовжувати інсталяцію?"
+
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Вам необхідно мати права root, щоб встановити наступні залежності:\n"
+"Інсталяція невдала, деякі файли відсутні:\n"
 "%s\n"
+"Можливо, Вам потрібно поновити вашу базу даних urpmi"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - друкувати changelog.\n"
+msgid "Installation failed"
+msgstr "Встановлення неуспішне"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "неможливо доступитися до файла списку \"%s\", носія проігноровано"
+msgid "distributing %s"
+msgstr "встановлюється %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - права дужка, щоб закрити груповий вираз.\n"
+msgid "installing %s"
+msgstr "встановлюється %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "не знайдено webfetch, підтримуються такі webfetch: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Встановлюється пакунок `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "перевіряється файл hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Спробувати інсталяцію без перевірки залежностей? (y/N) (т/Н) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "копіюється файл hdlists..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Спробувати примусове встановлення (--force)? (y/N) (т/Н) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "записується файл списку для носія \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d запит на встановлення завершився неуспішно"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"віртуальний носій \"%s\" повинен мати повне посилання (url), носія "
-"проігноровано"
+msgid "Installation is possible"
+msgstr "Встановлення можливе"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - виводити параметр buildhost: основний host.\n"
+msgid "Everything already installed"
+msgstr "Все вже встановлено"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Не робити нічого"
+msgid "restarting urpmi"
+msgstr "перезапуск urpmi"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "використовуються зв'язані носії для паралельного режиму: %s"
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"використання: urpmi.addmedia [параметри] <назва> <url> [з "
+"<відносним_шляхом>]\n"
+" де <url> - це один з\n"
+"       file://<шлях>\n"
+"       ftp://<логін>:<пароль>@<хост>/<шлях> з <відносна назва файла hdlist>\n"
+"        ftp://<хост>/<шлях> з <відносна назва файла hdlist>\n"
+"       http://<хост>/<шлях> з <відносна назва файла hdlist>\n"
+"\n"
+"і [параметри] є з\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "монтується %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - створити носія поновлення.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"неможливо переглянути носія \"%s\", оскільки файл списку вже "
-"використовується іншим носієм"
+"  --probe-synthesis - намагатися знайти і використати файл synthesis.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "неможливо одержати початкові пакунки, завершується"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - намагатися знайти і використати файл hdlist.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - використовувати інший root для встановлення rpm.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - не намагатися знайти файли synthesis або\n"
+"                   hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        завершено %s%% з %s, ETA = %s, швидкість = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - автоматично створювати всі носії із носія встановлення.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"розраховується md5sum для hdlist (або synthesis) джерела, що поновлюється"
+"  --distrib-XXX  - автоматично створювати носія для частини XXX\n"
+"....................дистрибутиву, XXX може бути main, contrib, updates\n"
+"....................або будь-що інше вже сконфігуроване ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "неможливо імпортувати файл ключів з \"%s\""
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - використовувати url для списку дзеркал, типове значення\n"
+"                   %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  --no-uninstall - ніколи не запитувати про вилучення пакунка, припиняти "
-"встановлення.\n"
+"  --version      - використовувати вказану версію дистрибутиву, типово\n"
+"                   використовується версія дистрибутиву, повідомлена\n"
+"                   встановленим пакунком випуску mandrake.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"версія urpmq %s\n"
-" Авторські права (C) 2000, 2001, 2002 MandrakeSoft.\n"
-" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
-"\n"
-"використання:\n"
+"  --arch         - використовувати вказану архітектуру, типово\n"
+"                   використовується архітектура встановленого пакунка\n"
+"                   випуску mandrake.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "відновлюється джерело hdlist (або synthesis) \"%s\"..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - створити віртуального носія з найновішими даними,\n"
+"                   дозволяється тільки протокол file:// protocol.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - також виводити групи з назвами.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - вимкнути перевірку файлів на MD5SUM.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "носія \"%s\" не вибрано"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - очищувати теку заголовків кешу.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Тільки користувачу root дозволяється встановлювати пакунки"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - змушувати генерувати hdlist файли.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "використовується особливе оточення на %s\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "неможливо додати поновлення дистрибутиву cooker\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "неможливо знайти файл hdlist для \"%s\", носія проігноровано"
+msgid "retrieving mirrors at %s ..."
+msgstr "поновлення дзеркал з %s ..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-level  - транзакції малої довжини, типова довжина %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "немає потреби задавати <відносний шлях hdlist> з --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - ліва дужка, щоб відкрити груповий вираз.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "неможливо поновити носія\"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "забагато точок монтування для змінного носія \"%s\""
+msgid "<relative path of hdlist> missing\n"
+msgstr "<відносний шлях hdlist> відсутній\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - двійковий оператор AND, повертає істина, якщо обидва "
-"вирази правдиві.\n"
+msgid "`with' missing for network media\n"
+msgstr "'with' відсутній для джерела з мережі\n"
+
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "неможливо створити носія\"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"неможливо отримати доступ до носія \"%s\",\n"
-"це може статися, якщо Ви змонтували теку вручну під час створення носія."
+"використання: urpmi.removemedia [-a] <назва> ...\n"
+"де <назва> - це назва носія для вилучення.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - виводити параметр group: група.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - вибрати всі носії.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - використовувати тільки задані носії, відокремлені комою.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "неможливо створити транзакцію"
+"\n"
+"невідомі параметри '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "відновлення rpm-файлів з носія \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "нічого вилучати (використовуйте urpmi.addmedia, щоб додати носія)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Ви вибрали джерельний пакунок:\n"
-"\n"
-"%s\n"
-"\n"
-"Можливо, Ви не хотіли встановлювати його (встановлення його\n"
-"зробить можливим вносити зміни у його вихідний текст і потім компілювати).\n"
-"\n"
-"Що Ви хочете зробити?"
+"об'єкта для вилучення немає\n"
+"(один з %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "встановлюється %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"використання: urpmi.update [параметри] <назва> ...\n"
+"де <назва> - це назва носія з поновленнями.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Встановлення неуспішне"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - поновити тільки носія з поновленнями.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "записати конфігураційний файл [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - виконати поновлення ключа gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - вибрати всі незнімні носії.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - виводити параметр epoch: період.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - перевірити підпис rpm перед встановленням\n"
-"                   (--no-verify-rpm вимикає це і встановлює типове "
-"значення).\n"
+"об'єкта для поновлення немає\n"
+"(один з %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"версія urpmf %s\n"
+" Авторські права (C) 2002 MandrakeSoft.\n"
+" Це вільне програмне забезпечення і розповсюджується під умовами GNU GPL.\n"
+"\n"
+"використання:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Вставте, будь-ласка, носія %s у пристрій %s"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - вивести список доступних пакунків.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - створити носія поновлення.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media - вивести список доступних носіїв.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - вивести наявні носії і їхні адреси.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - задати невизначений пошук (так само як --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config - вивести конфігурацію у формі аргументу urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "Гаразд"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr ""
+"  --list-nodes     - вивести список доступних вузлів при використанні --"
+"parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "неправильний опис hdlist \"%s\" у файлі hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - вивести список доступних паралельних псевдонімів.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "вилучається %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - вибрати заголовки для пакунків, перерахованих\n"
+"                          в базі даних urpmi, до stdout (root тільки).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - автоматично створювати носія для частини XXX\n"
-"....................дистрибутиву, XXX може бути main, contrib, updates\n"
-"....................або будь-що інше вже сконфігуроване ;-)\n"
+"  --sources      - вивести всі вихідні пакунки перед завантаженням (тільки "
+"root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - виводити параметр size: розмір.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - сконфігурувати urpmi на льоту з дерева дистрибутиву.\n"
+"                   Це дозволяє виконувати запити до дистрибутиву.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "для того, щоб встановити %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - друкувати changelog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "через незадоволеність %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - розширений запит до залежностей пакета.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Автоматичне встановлення пакунків...\n"
-"Ви замовили встановлення пакунка %s\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "urpmi database locked"
-msgstr "базу даних urpmi блоковано "
+"  -u             - пропустити пакунок, якщо новіша версія вже встановлена.\n"
 
-#: ../urpmi:1
+#: ../urpmq:80
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - відновити переміщення частково звантажених файлів\n"
-"                   (--no-resume вимикає його, типово вимкнено).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - повний вивід даних про пакунок для вилучення.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "перевіряється файл ключів з \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - зворотний пошук пакунків.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - вимкнути перевірку файлів на MD5SUM.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - виводити корисну інформацію в придатному для читання "
+"вигляді.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "отримується змінний пристрій як \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - також виводити групи з назвами.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Зараз Ви встановите наступний пакунок програм на свій комп'ютер:\n"
-"\n"
-"%s\n"
-"\n"
-"Можливо, Ви хочете просто зберегти його. Який Ваш вибір?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - також виводити версію і випуск з назвою.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - встановити нечіткий пошук (те саме, що -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l         - вивести список файлів у пакунку.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - пропустити пакунок, якщо новіша версія вже встановлена.\n"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  назви або rpm-файли, задані в командному рядку, необхідні.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - намагатися знайти і використати файл hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes може використовуватися тільки з --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "через відсутність %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - використовування тільки носії з поновленнями.\n"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "не знайдено повного списку носіїв"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"використання: urpmi.update [параметри] <назва> ...\n"
-"де <назва> - це назва носія з поновленнями.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "спроба обійти існуючого носія \"%s\", обхід"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Один з наступних пакунків потрібен для встановлення %s:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - перевірити, чи дане встановлення можливе.\n"
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "версія urpmq %s\n"
+#~ " Авторські права (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ " Це вільне програмне забезпечення і розповсюджується під умовами GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "використання:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Невідомий webfetch `%s' !!!\n"
@@ -2190,9 +2236,6 @@ msgstr "  --test         - перевірити, чи дане встановл�
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "спробуйте urpmf --help для додаткових параметрів"
 
-#~ msgid "no full media list was found"
-#~ msgstr "не знайдено повного списку носіїв"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "копіюється список джерел \"%s\"..."
 
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 08657d24..1b3fc295 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\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"
@@ -34,1790 +34,1818 @@ msgstr ""
 msgid "Nn"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+msgid "installing %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
+msgid "Is this OK?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
+msgid "Ok"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
+msgid "Cancel"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
+msgid " (Y/n) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid "%s: command not found\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Everything already installed"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
+msgid "   -h|--help      - print this help message.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "   -g [group]     - restrict results to given group.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "                    defaults is %s.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:57
 #, c-format
-msgid "What is your choice? (1-%d) "
+msgid "unknown protocol defined for %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "found %d headers in cache"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "syntax error in config file at line %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "performing second pass to compute dependencies\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "retrieving rpm file [%s] ..."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:202
 #, c-format
-msgid "...retrieving failed: %s"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:213
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Package installation..."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "invalid rpm file name [%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "%d installation transactions failed"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Sorry, bad choice, try again\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:301
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
+msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:309
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Install it"
+msgid "too many mount points for removable medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --X            - use X interface.\n"
+msgid "taking removable device as \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "One of the following packages is needed:"
+msgid "using different removable device [%s] for \"%s\""
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "unable to write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "Downloading package `%s'..."
+msgid "write config file [%s]"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "unable to parse \"%s\" in file [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:423
 #, c-format
-msgid "no package named %s"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+msgid "using associated media for parallel mode: %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
+msgid "examining hdlist file [%s]"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
+msgid "unable to open rpmdb"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
+msgid "added medium %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
+msgid "unable to access first installation medium"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
+msgid "copying hdlists file..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
+msgid "...copying failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+msgid "...copying done"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
+msgid "retrieving hdlists file..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
+msgid "...retrieving done"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "...retrieving failed: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "\"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
+msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
+msgid "examining MD5SUM file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
+msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
+msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
+msgid "reading rpm files from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "unable to read rpm files from [%s]: %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
+msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
+msgid "md5sum mismatch"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "unable to write list file of \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
+msgid "writing list file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
+msgid "reading headers from medium \"%s\""
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "building hdlist [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
+msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
+msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
+msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "mounting %s"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
+msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "invalid rpm file name [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "retrieving rpm file [%s] ..."
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
+msgid "unable to register rpm file"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
+msgid "error registering local packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgid "no package named %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
+msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
+msgid "medium \"%s\" does not define any location for rpm files"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "no entries relocated in depslist"
+msgid "package %s is not found."
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
+msgid "urpmi database locked"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "medium \"%s\" is not selected"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "do you agree ?"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
+msgid "unable to access medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "...retrieving done"
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "retrieving rpm files from medium \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "skipping package %s"
+msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2786
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "removing package %s"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "unable to remove package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "unable to install package %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "due to conflicts with %s"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "removing %d obsolete headers in cache"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "unable to update medium \"%s\"\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "Preparing..."
+msgid "unrequested"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "                    defaults is %s.\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3094
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "Sorry, bad choice, try again\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid "  --help         - print this help message.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "...copying done"
+msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "unable to use parallel option \"%s\""
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "unable to access first installation medium"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "virtual medium need to be local"
+msgid "removing package %s will break your system"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "error registering local packages"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:99
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
+msgid "Checking to remove the following packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "no rpm files found from [%s]"
+msgid "removing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "nothing written in list file for \"%s\""
+msgid "Removing failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:27
 #, c-format
-msgid "The following packages have bad signatures"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to install package %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --uniq         - do not print identical lines.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "  --all          - print all tags.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+msgid "  --group        - print tag group: group.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
+msgid "  --size         - print tag size: size.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
+msgid "  --description  - print tag description: description.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --url          - print tag url: url.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
+msgid "  --files        - print tag files: all files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --X            - use X interface.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
+msgid "Choose location to save file"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "Do nothing"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "Yes, really install it"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
+msgid "Save file"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "Install it"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
+msgid "Unable to create directory [%s] for bug report"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid "Copying failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
+msgid "Only superuser is allowed to install packages"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
+msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
+msgid "What is your choice? (1-%d) "
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "Package installation..."
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
+msgid "Initializing..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
+msgid "do you agree ?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid "Press Enter when ready..."
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
+msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
+msgid "The following packages have bad signatures"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid "  --changelog    - print changelog.\n"
+msgid "Do you want to continue installation ?"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Installation failed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "distributing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "examining hdlist file [%s]"
+msgid "installing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "copying hdlists file..."
+msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "writing list file for medium \"%s\""
+msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:772
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:780
 #, c-format
-msgid "Do nothing"
+msgid "Installation is possible"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "using associated media for parallel mode: %s"
+msgid "Everything already installed"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "mounting %s"
+msgid "restarting urpmi"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid "  --update       - create an update medium.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"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"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "medium \"%s\" is not selected"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "Only superuser is allowed to install packages"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  -c             - clean headers cache directory.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "unable to update medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "  --group        - print tag group: group.\n"
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid "unable to create medium \"%s\"\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "unable to create transaction"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
+msgid "  -a             - select all media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:39
 #, c-format
 msgid ""
-"You have selected a source package:\n"
 "\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"unknown options '%s'\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "distributing %s"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
-msgid "Installation failed"
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:28
 #, c-format
-msgid "write config file [%s]"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:38
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
+msgid "  --update       - update only update media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:40
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "  --force-key    - force update of gpg key.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:41
 #, c-format
-msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:63
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:75
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:38
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:53
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid "  --list         - list available packages.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "Ok"
+msgid "  --list-media   - list available media.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:56
 #, c-format
-msgid "removing %s"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:57
 #, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:58
 #, c-format
-msgid "  --size         - print tag size: size.\n"
+msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:60
 #, c-format
-msgid "in order to keep %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  -l             - list files in package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "--list-nodes can only be used with --parallel"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 480fb649..026218ca 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-16 00:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -34,832 +34,758 @@ msgstr "ҲҳHhYy"
 msgid "Nn"
 msgstr "ЖжJjNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s ўрнатилмоқда\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Пакетларни автоматик равишда ўрнатиш...\n"
+"Сиз ўрнатишни талаб қилдинган пакет: %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb'ни очиб бўлмади"
+msgid "Is this OK?"
+msgstr "Бўладими?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
+msgid "Ok"
+msgstr "Ок"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s'ни ўрнатиш учун қуйидаги пакетлардан бири керак:"
+msgid "Cancel"
+msgstr "Бекор қилиш"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s пакети олиб ташланмоқда"
+msgid " (Y/n) "
+msgstr " (Ҳ/й) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: буйруқ топилмади\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Ҳамма нарса аллақачон ўрнатилган"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - шу ёрдам хабарини кўрсатиш.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - сарлавҳаларнинг кэш директориясини тозалаш.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s учун номаълум протокол аниқланган"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Нимани танлайсиз? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "мослама файлининг %s чи сатрда хато"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "кэшда %d сарлавҳа топилди"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "номи (%s) бир ҳил бўлган бир нечта RPM-файли мавжуд"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "боғликларни аниқлаш учун иккинчи босқич бажарилмоқди\n"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "RPM-файли (%s) олинмоқда..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...олиш муваффақиятсиз тудаги: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "hdlist файлининг (%s) манбасини аниқлаб бўлмади"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Пакетни ўрнатиш..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "RPM-файлининг номи (%s) нотўғри"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Узр, нотўғри танлов. Бошқасини танланг\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - summary тэгини кўрсатиш: ҳисобот.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуйидаги пакетларда %s бор: %s"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Install it"
-msgstr "Ўрнатиш"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X интерфейсидан фойдаланиш.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Қуйидаги пакетлардан бири керак:"
+msgid "unable to write config file [%s]"
+msgstr "мослама файлини (%s) ёзиб бўлмади"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар олиб ташланади (%d Мб)"
+msgid "write config file [%s]"
+msgstr "мослама файли (%s) ёзилмоқда"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "\"%s\" пакети олинмоқда..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - системани янгилаш учун пакетларни авто-танлаш.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "%s номли пакет мавжуд эмас"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
-"%s\n"
-"Балки urpmi маълумот базасини янгилашингиз керак."
+"--synthesis'дан --media, --excludemedia, --sortmedia, --update or --parallel "
+"билан бирга фойдаланиб бўлмайди"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Фойдаланиш: urpmi.removemedia [-a] <ном>...\n"
-"<ном> - олиб ташланадиган манбанинг номи.\n"
+msgid "examining synthesis file [%s]"
+msgstr "synthesis файли (%s) текширилмоқда"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Ўрнатишни давом этиб бўлмайди, чунки бошқаларни янгилаш\n"
-"учун қуйидаги пакетларни олиб ташлаш керак:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "hdlist файли (%s) текширилмоқда"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "манбанинг (%s) hdlist ёки synthesis файлини ўқишда муаммо юзага келди"
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "номаълум пакет"
+msgid "performing second pass to compute dependencies\n"
+msgstr "боғликларни аниқлаш учун иккинчи босқич бажарилмоқди\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "Ўрнатиш мумкин"
+msgid "skipping package %s"
+msgstr "%s пакети ташлаб ўтилмоқда"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+msgid "would install instead of upgrade package %s"
 msgstr ""
-"Бошқаларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
-"%s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади (%d Мб)"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+msgid "unable to open rpmdb"
+msgstr "rpmdb'ни очиб бўлмади"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Й) "
+msgid "medium \"%s\" already exists"
+msgstr "манба (%s) аллақачон мавжуд"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ортиқча хабарлар билан.\n"
+msgid "added medium %s"
+msgstr "%s манбаси қўшилди"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Ишга таёрланмоқда..."
+msgid "unable to access first installation medium"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - мавжуд бўлган пакетлар рўйхатини кўрсатиш.\n"
+msgid "copying hdlists file..."
+msgstr "hdlists файлидан нусха кўчирилмоқда..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - ҳамма тэгларни кўрсатиш.\n"
+msgid "...copying failed"
+msgstr "...нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "...copying done"
+msgstr "...нусха кўчириш бажарилди"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"манбанинг олинган hdlist (ёки synthesis) файлинининг md5sum'и ҳисобланмоқда"
+msgid "retrieving hdlists file..."
+msgstr "hdlists файли олинмоқда..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...олиш тугади"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Таёр бўлганда ENTER тугмасини босинг..."
+msgid "...retrieving failed: %s"
+msgstr "...олиш муваффақиятсиз тудаги: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
-"\n"
-"номаълум параметрлар \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "манбанинг (%s) hdlist ёки synthesis файлини ўқишда муаммо юзага келди"
-
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
+msgid "selecting multiple media: %s"
 msgstr ""
-"  --wget         - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "манба (%s) ўчирилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] hdlist файли яратилмоқда"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM файли текширилмоқда"
+msgid "copying description file of \"%s\"..."
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: буйруқ топилмади\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "мавжуд бўлган hdlist (ёки synthesis) файли учун md5sum ҳисобланмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM файли текширилмоқда"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists файли олинмоқда..."
-
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
+"манбанинг олинган hdlist (ёки synthesis) файлинининг md5sum'и ҳисобланмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "added medium %s"
-msgstr "%s манбаси қўшилди"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ишлатилмаган RPM'ни кэшда сақлаш.\n"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Манбанинг (%s) synthesis файлини ўқишда муаммо юзага келди"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "RPM-файллари %s'дан ўқилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum мос келмади"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s]: %s'дан RPM-файлларни ўқиб бўлмади"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "мослама файлининг %s чи сатрда хато"
+msgid "no rpm files found from [%s]"
+msgstr "%s'дан RPM-файллар топилмади"
 
-#: ../urpmi:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1356
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "in order to install %s"
-msgstr "%s'ни ўрнатиш учун"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "md5sum mismatch"
+msgstr "md5sum мос келмади"
 
-#: ../urpmf:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "no hdlist file found for medium \"%s\""
+msgstr "манбада (%s) ҳеч қандай hdlist файли топилмади"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - url тэгини кўрсатиш: url.\n"
+msgid "unable to write list file of \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s учун номаълум протокол аниқланган"
+msgid "writing list file for medium \"%s\""
+msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
 
-#: ../urpmq:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "манба (%s) аллақачон мавжуд"
-
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
-msgstr "%s ўрнатилмоқда\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
-"янгилаш параметри етишмаяпти\n"
-"(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "trying to promote %s"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unable to remove package %s"
-msgstr "пакетни (%s) олиб ташлаб бўлмади"
+msgid "reading headers from medium \"%s\""
+msgstr "манбадан (%s) сарлавҳалар ўқилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Манбанинг (%s) synthesis файлини ўқишда муаммо юзага келди"
+msgid "building hdlist [%s]"
+msgstr "[%s] hdlist файли яратилмоқда"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"олиб ташлаш параметри етишмаяпти\n"
-"(қуйидагилардан биттаси: %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "манба (%s) учун hdlist synthesis файли яратилди"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - ҳамма манбаларни танлаш.\n"
+msgid "found %d headers in cache"
+msgstr "кэшда %d сарлавҳа топилди"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Имзо етишмайди (%s)"
+msgid "removing %d obsolete headers in cache"
+msgstr "Кэшдаги %d эски сарлавҳа ўчирилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s]: %s'дан RPM-файлларни ўқиб бўлмади"
+msgid "mounting %s"
+msgstr "%s уланмоқда"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+msgid "unmounting %s"
+msgstr "%s узилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1942
 #, c-format
-msgid " (Y/n) "
-msgstr " (Ҳ/й) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "RPM-файли (%s) олинмоқда..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpme:1
-#, c-format
-msgid "removing package %s will break your system"
-msgstr "пакетни (%s) олиб ташлаш системангизни ишдан чиқаради"
-
-#: ../urpmq:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - мавжуд бўлган манбалар рўйхатини кўрсатиш.\n"
+msgid "unable to register rpm file"
+msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "error registering local packages"
 msgstr ""
-"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
-"%s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
+msgid "no package named %s"
+msgstr "%s номли пакет мавжуд эмас"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "The following packages contain %s: %s"
+msgstr "Қуйидаги пакетларда %s бор: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "номи (%s) бир ҳил бўлган бир нечта RPM-файли мавжуд"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
-"  --curl         - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "do you agree ?"
-msgstr "розимисиз ?"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "манба (%s) RPM-файлларнинг жойини аниқламаган"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "...retrieving done"
-msgstr "...олиш тугади"
+msgid "package %s is not found."
+msgstr "%s пакети топилмади."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s пакети қўшилмоқда (id=%d, eid=%d, янгилаш=%d, файл=%s)"
+msgid "urpmi database locked"
+msgstr "urpmi маълумот базаси қулфланган"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "skipping package %s"
-msgstr "%s пакети ташлаб ўтилмоқда"
+msgid "medium \"%s\" is not selected"
+msgstr "манба (%s) танланмаган"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Имзо ҳақиқий эмас (%s)"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM-файлини (%s) манбадан (%s) ўқиб бўлмади"
 
-#: ../urpmq:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "unable to access medium \"%s\""
 msgstr ""
-"urpmi, версия %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - кўрсатилган, вергул билан ажратилган, манбалардан "
-"фойдаланмаш.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "RPM -файллари манбадан (%s) олинмоқда..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "hdlist файлининг (%s) манбасини аниқлаб бўлмади"
+msgid "Preparing..."
+msgstr "Таёрланмоқда..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "due to conflicts with %s"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Кэшдаги %d эски сарлавҳа ўчирилмоқда"
+msgid "removing package %s"
+msgstr "%s пакети олиб ташланмоқда"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "манбани (%s) янгилаб бўлмади\n"
+msgid "unable to remove package %s"
+msgstr "пакетни (%s) олиб ташлаб бўлмади"
 
-#: ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s пакети қўшилмоқда (id=%d, eid=%d, янгилаш=%d, файл=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr ""
+msgid "unable to install package %s"
+msgstr "%s пакетини ўрнатиб бўлмади"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Preparing..."
-msgstr "Таёрланмоқда..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
+msgid "due to missing %s"
+msgstr "%s етишмаганига кўра"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3011
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - synthesis ёки hdlist файлини топишга уринмаш.\n"
+msgid "trying to promote %s"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+msgid "in order to keep %s"
+msgstr "%s'ни қолдириш учун"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
+msgid "in order to install %s"
+msgstr "%s'ни ўрнатиш учун"
 
-#: ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Имзо ҳақиқий эмас (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
+msgid "Missing signature (%s)"
+msgstr "Имзо етишмайди (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Узр, нотўғри танлов. Бошқасини танланг\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -875,612 +801,654 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...нусха кўчириш бажарилди"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr ""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - пакетларни олиш тезлигини чеклаш.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ортиқча хабарлар билан.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr ""
+msgid "unknown packages"
+msgstr "Номаълум пакетлар"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "%s'дан RPM-файллар топилмади"
+msgid "unknown package"
+msgstr "номаълум пакет"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
+msgid "removing package %s will break your system"
+msgstr "пакетни (%s) олиб ташлаш системангизни ишдан чиқаради"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
+msgid "Nothing to remove"
+msgstr "Ўчириш учун ҳеч нарса йўқ"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "мавжуд бўлган hdlist (ёки synthesis) файли учун md5sum ҳисобланмоқда"
+msgid "Checking to remove the following packages"
+msgstr "Қуйидаги пакетларни олиб ташлаш учун текшириш бажарилмоқда"
 
-#: ../urpmq:1
+#: ../urpme:106
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr ""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар олиб ташланади (%d Мб)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s пакетини ўрнатиб бўлмади"
+msgid " (y/N) "
+msgstr " (ҳ/Й) "
 
-#: ../urpmi:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
+msgid "removing %s"
+msgstr "%s ўчирилмоқда"
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "Ўчириш муваффақиятсиз тугади"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf, версия %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Файлни сақлаш"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - фақат янгилаш манбасидан фойдаланиш.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - фақат кўрсатилган, вергул билан ажратилган, манбалардан "
+"фойдаланиш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "мослама файлини (%s) ёзиб бўлмади"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - кўрсатилган, вергул билан ажратилган, манбалардан "
+"фойдаланмаш.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ортиқча хабарлар билан.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr ""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - бир ҳил қаторларни кўрсатмаш.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - ҳамма тэгларни кўрсатиш.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - size тэгини кўрсатиш: ҳажми.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Қуйидаги пакетларни олиб ташлаш учун текшириш бажарилмоқда"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - summary тэгини кўрсатиш: ҳисобот.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - description тэгини кўрсатиш: таърифи.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - files тэгини кўрсатиш: ҳамма файллар.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ўрнатишни давом этишни истайсизми?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - url тэгини кўрсатиш: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-файлини (%s) манбадан (%s) ўқиб бўлмади"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "манба (%s) учун hdlist synthesis файли яратилди"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - files тэгини кўрсатиш: ҳамма файллар.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:56
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:59
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "unmounting %s"
-msgstr "%s узилмоқда"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:64
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
-"янгилаш учун ҳеч нарса йўқ (манбани қўшиш учун\n"
-"urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% бажарилди, тезлик = %s"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi қайтадан ишга тушмоқда"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "synthesis файли (%s) текширилмоқда"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "...copying failed"
-msgstr "...нусха кўчириш муваффақиятсиз тугади"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmi, версия %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - хабарсиз.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
 
-#: ../urpmf:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ортиқча хабарлар билан.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - системани янгилаш учун пакетларни авто-танлаш.\n"
 
-#: ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:88
 #, c-format
-msgid "unknown packages"
-msgstr "Номаълум пакетлар"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:94
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"олиб ташлаш учун ҳеч нарса йўқ (манбани қўшиш\n"
-"учун urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:96
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - шу ёрдам хабарини кўрсатиш.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ишлатилмаган RPM'ни кэшда сақлаш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:104
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, 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"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"urpmf, версия %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
+"  --wget         - масофадаги файлларни олиш учун wget дастурини ишлатиш.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
+"  --curl         - масофадаги файлларни олиш учун curl дастурини ишлатиш.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - бир ҳил қаторларни кўрсатмаш.\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - пакетларни олиш тезлигини чеклаш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"--synthesis'дан --media, --excludemedia, --sortmedia, --update or --parallel "
-"билан бирга фойдаланиб бўлмайди"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Бўладими?"
-
-#: ../urpmi:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - қўлланма файлларсиз.\n"
-
-#: ../urpmf:1 ../urpmq:1
-#, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:115
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:119
 #, c-format
-msgid "Nothing to remove"
-msgstr "Ўчириш учун ҳеч нарса йўқ"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X интерфейсидан фойдаланиш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "манбадан (%s) сарлавҳалар ўқилмоқда"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "манба (%s) RPM-файлларнинг жойини аниқламаган"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - қўлланма файлларсиз.\n"
 
-#: ../urpmf:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - description тэгини кўрсатиш: таърифи.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "Copying failed"
-msgstr "Нусха кўчириш муваффақиятсиз тугади"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - хабарсиз.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "манбада (%s) ҳеч қандай hdlist файли топилмади"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "installing %s"
-msgstr "%s ўрнатилмоқда"
+msgid "Do nothing"
+msgstr "Ҳеч нарса қилмаш"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "RPM-файллари %s'дан ўқилмоқда"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
+msgid "Save file"
+msgstr "Файлни сақлаш"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:230
 #, c-format
-msgid "Removing failed"
-msgstr "Ўчириш муваффақиятсиз тугади"
+msgid "Install it"
+msgstr "Ўрнатиш"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "%s пакети топилмади."
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "манба (%s) ўчирилмоқда"
+msgid "Copying failed"
+msgstr "Нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr ""
+msgid "Only superuser is allowed to install packages"
+msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Бекор қилиш"
+msgid "One of the following packages is needed:"
+msgstr "Қуйидаги пакетлардан бири керак:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Нимани танлайсиз? (1-%d) "
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+msgid "Package installation..."
+msgstr "Пакетни ўрнатиш..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
+msgid "Initializing..."
+msgstr "Ишга таёрланмоқда..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
+"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "манбани (%s) яратиб бўлмади\n"
+msgid "do you agree ?"
+msgstr "розимисиз ?"
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
+"Ўрнатишни давом этиб бўлмайди, чунки бошқаларни янгилаш\n"
+"учун қуйидаги пакетларни олиб ташлаш керак:\n"
+"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"Бошқаларни янгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
+"%s"
+
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади (%d Мб)"
 
-#: ../urpmi:1
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1489,397 +1457,474 @@ msgstr ""
 "Қуйидаги боғлиқликларни ўрнатиш учун сиз root бўлишингиз керак:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Илтимос \"%s\" номли манбани [%s] ускунасига қўйинг"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Press Enter when ready..."
+msgstr "Таёр бўлганда ENTER тугмасини босинг..."
+
+#: ../urpmi:585
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "\"%s\" пакети олинмоқда..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s дан бажарилди, ЕТА = %s, тезлик = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% бажарилди, тезлик = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ўрнатишни давом этишни истайсизми?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"Ўрнатиш муваффақиятсиз тугади, баъзи бир файллар етишмайди:\n"
+"%s\n"
+"Балки urpmi маълумот базасини янгилашингиз керак."
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Installation failed"
+msgstr "Ўрнатиш муваффақиятсиз тугади"
+
+#: ../urpmi:665
+#, c-format
+msgid "distributing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "hdlist файли (%s) текширилмоқда"
+msgid "installing %s"
+msgstr "%s ўрнатилмоқда"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlists файлидан нусха кўчирилмоқда..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Боғлиқликларни текширмасдан ўрнатиб кўрайми? (ҳ/Й) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:772
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:780
 #, c-format
-msgid "Do nothing"
-msgstr "Ҳеч нарса қилмаш"
+msgid "Installation is possible"
+msgstr "Ўрнатиш мумкин"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "Everything already installed"
+msgstr "Ҳамма нарса аллақачон ўрнатилган"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "mounting %s"
-msgstr "%s уланмоқда"
+msgid "restarting urpmi"
+msgstr "urpmi қайтадан ишга тушмоқда"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - янгилаш манбасини яратиш.\n"
+
+#: ../urpmi.addmedia:56
+#, c-format
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
+"  --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга уриниб "
+"кўриш.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
+"  --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
+"кўриш.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s дан бажарилди, ЕТА = %s, тезлик = %s"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - synthesis ёки hdlist файлини топишга уринмаш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"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"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"urpmq, версия %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "манба (%s) танланмаган"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - сарлавҳаларнинг кэш директориясини тозалаш.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "манбани (%s) янгилаб бўлмади\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - group тэгини кўрсатиш: гуруҳ.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "манбани (%s) яратиб бўлмади\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --media        - фақат кўрсатилган, вергул билан ажратилган, манбалардан "
-"фойдаланиш.\n"
+"Фойдаланиш: urpmi.removemedia [-a] <ном>...\n"
+"<ном> - олиб ташланадиган манбанинг номи.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "unable to create transaction"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - ҳамма манбаларни танлаш.\n"
+
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"номаълум параметрлар \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM -файллари манбадан (%s) олинмоқда..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"олиб ташлаш учун ҳеч нарса йўқ (манбани қўшиш\n"
+"учун urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"олиб ташлаш параметри етишмаяпти\n"
+"(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Ўрнатиш муваффақиятсиз тугади"
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "мослама файли (%s) ёзилмоқда"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"янгилаш учун ҳеч нарса йўқ (манбани қўшиш учун\n"
+"urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"янгилаш параметри етишмаяпти\n"
+"(қуйидагилардан биттаси: %s)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf, версия %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Илтимос \"%s\" номли манбани [%s] ускунасига қўйинг"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - мавжуд бўлган пакетлар рўйхатини кўрсатиш.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - янгилаш манбасини яратиш.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - мавжуд бўлган манбалар рўйхатини кўрсатиш.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - мавжуд бўлган манба ва унинг URL'ни кўрсатиш.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "%s ўчирилмоқда"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - size тэгини кўрсатиш: ҳажми.\n"
-
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "in order to keep %s"
-msgstr "%s'ни қолдириш учун"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:65
 #, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:75
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "  --changelog    - print changelog.\n"
 msgstr ""
-"Пакетларни автоматик равишда ўрнатиш...\n"
-"Сиз ўрнатишни талаб қилдинган пакет: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi маълумот базаси қулфланган"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:82
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:85
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:86
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - пакетдаги файлларни кўрсатиш.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:90
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:150
 #, c-format
-msgid "due to missing %s"
-msgstr "%s етишмаганига кўра"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:327
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - фақат янгилаш манбасидан фойдаланиш.\n"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:388
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:398
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No changelog found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s'ни ўрнатиш учун қуйидаги пакетлардан бири керак:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq, версия %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+#~ "\n"
+#~ "Фойдаланиш:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Номаълум webfetch \"%s\" !!!\n"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 53d3352c..9b911a89 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-02-16 00:00+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -34,838 +34,760 @@ msgstr "HhHhYy"
 msgid "Nn"
 msgstr "JjJjNn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "%s o'rnatilmoqda\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
+"Paketlarni avtomatik ravishda o'rnatish...\n"
+"Siz o'rnatishni talab qildingan paket: %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "rpmdb'ni ochib bo'lmadi"
+msgid "Is this OK?"
+msgstr "Bo'ladimi?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
+msgid "Ok"
+msgstr "Ok"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "%s'ni o'rnatish uchun quyidagi paketlardan biri kerak:"
+msgid "Cancel"
+msgstr "Bekor qilish"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "%s paketi olib tashlanmoqda"
+msgid " (Y/n) "
+msgstr " (H/y) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: buyruq topilmadi\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Hamma narsa allaqachon o'rnatilgan"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - shu yordam xabarini ko'rsatish.\n"
+
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
+
+#: ../urpm.pm:57
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - sarlavhalarning kesh direktoriyasini tozalash.\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s uchun noma'lum protokol aniqlangan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "using process %d for executing transaction"
+msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:95
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
+msgid "unable to handle protocol: %s"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Nimani tanlaysiz? (1-%d) "
+msgid "syntax error in config file at line %s"
+msgstr "moslama faylining %s chi satrda xato"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "found %d headers in cache"
-msgstr "keshda %d sarlavha topildi"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "nomi (%s) bir hil bo'lgan bir nechta RPM-fayli mavjud"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "bog'liklarni aniqlash uchun ikkinchi bosqich bajarilmoqdi\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "RPM-fayli (%s) olinmoqda..."
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:209
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:213
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...olish muvaffaqiyatsiz tudagi: %s"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "hdlist faylining (%s) manbasini aniqlab bo'lmadi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:222
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:249
 #, c-format
-msgid "Package installation..."
-msgstr "Paketni o'rnatish..."
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "RPM-faylining nomi (%s) noto'g'ri"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid "bad proxy declaration on command line\n"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:271
 #, c-format
-msgid "%d installation transactions failed"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:309
 #, c-format
-msgid "Choose location to save file"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:342
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - summary tegini ko'rsatish: hisobot.\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:343
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Quyidagi paketlarda %s bor: %s"
+msgid "taking removable device as \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "Install it"
-msgstr "O'rnatish"
+msgid "using different removable device [%s] for \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - X interfeysidan foydalanish.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Quyidagi paketlardan biri kerak:"
+msgid "unable to write config file [%s]"
+msgstr "moslama faylini (%s) yozib bo'lmadi"
 
-#: ../urpme:1
+#: ../urpm.pm:390
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr ""
-"Bog'liqliklarni ta'minlash uchun quyidagi paketlar olib tashlanadi (%d Mb)"
+msgid "write config file [%s]"
+msgstr "moslama fayli (%s) yozilmoqda"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "Can't use parallel mode with use-distrib mode"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "\"%s\" paketi olinmoqda..."
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:423
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
+msgid "examining parallel handler in file [%s]"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
-"  --auto-select  - sistemani yangilash uchun paketlarni avto-tanlash.\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:437
 #, c-format
-msgid "no package named %s"
-msgstr "%s nomli paket mavjud emas"
+msgid "using associated media for parallel mode: %s"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:441
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
+msgid "unable to use parallel option \"%s\""
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"O'rnatish muvaffaqiyatsiz tugadi, ba'zi bir fayllar etishmaydi:\n"
-"%s\n"
-"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
+"--synthesis'dan --media, --excludemedia, --sortmedia, --update or --parallel "
+"bilan birga foydalanib bo'lmaydi"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"Foydalanish: urpmi.removemedia [-a] <nom>...\n"
-"<nom> - olib tashlanadigan manbaning nomi.\n"
+msgid "examining synthesis file [%s]"
+msgstr "synthesis fayli (%s) tekshirilmoqda"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"O'rnatishni davom etib bo'lmaydi, chunki boshqalarni yangilash\n"
-"uchun quyidagi paketlarni olib tashlash kerak:\n"
-"%s\n"
+msgid "examining hdlist file [%s]"
+msgstr "hdlist fayli (%s) tekshirilmoqda"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "`with' missing for network media\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr ""
+"manbaning (%s) hdlist yoki synthesis faylini o'qishda muammo yuzaga keldi"
 
-#: ../urpme:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "unknown package"
-msgstr "noma'lum paket"
+msgid "performing second pass to compute dependencies\n"
+msgstr "bog'liklarni aniqlash uchun ikkinchi bosqich bajarilmoqdi\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid "Installation is possible"
-msgstr "O'rnatish mumkin"
+msgid "skipping package %s"
+msgstr "%s paketi tashlab o'tilmoqda"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
+msgid "would install instead of upgrade package %s"
 msgstr ""
-"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d Mb)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
+msgid "unable to open rpmdb"
+msgstr "rpmdb'ni ochib bo'lmadi"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (h/Y) "
+msgid "medium \"%s\" already exists"
+msgstr "manba (%s) allaqachon mavjud"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
+msgid "virtual medium need to be local"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - ortiqcha xabarlar bilan.\n"
+msgid "added medium %s"
+msgstr "%s manbasi qo'shildi"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Ishga tayorlanmoqda..."
+msgid "unable to access first installation medium"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
+msgid "copying hdlists file..."
+msgstr "hdlists faylidan nusxa ko'chirilmoqda..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - hamma teglarni ko'rsatish.\n"
+msgid "...copying failed"
+msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
+msgid "...copying done"
+msgstr "...nusxa ko'chirish bajarildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:691
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr ""
-"manbaning olingan hdlist (yoki synthesis) faylinining md5sum'i hisoblanmoqda"
+msgid "retrieving hdlists file..."
+msgstr "hdlists fayli olinmoqda..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr ""
+msgid "...retrieving done"
+msgstr "...olish tugadi"
 
-#: ../urpmi:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Tayor bo'lganda ENTER tugmasini bosing..."
+msgid "...retrieving failed: %s"
+msgstr "...olish muvaffaqiyatsiz tudagi: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr ""
-"\n"
-"noma'lum parametrlar \"%s\"\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid "selecting multiple media: %s"
 msgstr ""
-"manbaning (%s) hdlist yoki synthesis faylini o'qishda muammo yuzaga keldi"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr ""
-"  --wget         - masofadagi fayllarni olish uchun wget dasturini "
-"ishlatish.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr ""
+msgid "removing medium \"%s\""
+msgstr "manba (%s) o'chirilmoqda"
 
-#: ../urpmq:1
+#: ../urpm.pm:943
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "[%s] hdlist fayli yaratilmoqda"
-
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "MD5SUM fayli tekshirilmoqda"
+msgid "copying description file of \"%s\"..."
+msgstr ""
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: buyruq topilmadi\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr ""
+"mavjud bo'lgan hdlist (yoki synthesis) fayli uchun md5sum hisoblanmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
+msgid "examining MD5SUM file"
+msgstr "MD5SUM fayli tekshirilmoqda"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm.pm:1
-#, c-format
-msgid "retrieving hdlists file..."
-msgstr "hdlists fayli olinmoqda..."
-
-#: ../urpmi:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "Yes, really install it"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr ""
+"manbaning olingan hdlist (yoki synthesis) faylinining md5sum'i hisoblanmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "added medium %s"
-msgstr "%s manbasi qo'shildi"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - ishlatilmagan RPM'ni keshda saqlash.\n"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "Manbaning (%s) synthesis faylini o'qishda muammo yuzaga keldi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
+msgid "reading rpm files from [%s]"
+msgstr "RPM-fayllari %s'dan o'qilmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum mos kelmadi"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "[%s]: %s'dan RPM-fayllarni o'qib bo'lmadi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "moslama faylining %s chi satrda xato"
+msgid "no rpm files found from [%s]"
+msgstr "%s'dan RPM-fayllar topilmadi"
 
-#: ../urpmi:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1356
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgid "found probed hdlist (or synthesis) as %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "in order to install %s"
-msgstr "%s'ni o'rnatish uchun"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "md5sum mismatch"
+msgstr "md5sum mos kelmadi"
 
-#: ../urpmf:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr ""
+msgid "no hdlist file found for medium \"%s\""
+msgstr "manbada (%s) hech qanday hdlist fayli topilmadi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "would install instead of upgrade package %s"
+msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "retrieving mirrors at %s ..."
+msgid "unable to parse hdlist file of \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - url tegini ko'rsatish: url.\n"
+msgid "unable to write list file of \"%s\""
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s uchun noma'lum protokol aniqlangan"
+msgid "writing list file for medium \"%s\""
+msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
 
-#: ../urpmq:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
+msgid "nothing written in list file for \"%s\""
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "manba (%s) allaqachon mavjud"
-
-#: ../_irpm:1
-#, c-format
-msgid "installing %s\n"
-msgstr "%s o'rnatilmoqda\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
-"yangilash parametri etishmayapti\n"
-"(quyidagilardan bittasi: %s)\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "trying to promote %s"
+msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "unable to remove package %s"
-msgstr "paketni (%s) olib tashlab bo'lmadi"
+msgid "reading headers from medium \"%s\""
+msgstr "manbadan (%s) sarlavhalar o'qilmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Manbaning (%s) synthesis faylini o'qishda muammo yuzaga keldi"
+msgid "building hdlist [%s]"
+msgstr "[%s] hdlist fayli yaratilmoqda"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"olib tashlash parametri etishmayapti\n"
-"(quyidagilardan bittasi: %s)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "manba (%s) uchun hdlist synthesis fayli yaratildi"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - hamma manbalarni tanlash.\n"
+msgid "found %d headers in cache"
+msgstr "keshda %d sarlavha topildi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Imzo etishmaydi (%s)"
+msgid "removing %d obsolete headers in cache"
+msgstr "Keshdagi %d eski sarlavha o'chirilmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "[%s]: %s'dan RPM-fayllarni o'qib bo'lmadi"
+msgid "mounting %s"
+msgstr "%s ulanmoqda"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
+msgid "unmounting %s"
+msgstr "%s uzilmoqda"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
+msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "  --update       - update only update media.\n"
+msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1942
 #, c-format
-msgid " (Y/n) "
-msgstr " (H/y) "
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "RPM-fayli (%s) olinmoqda..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "malformed input: [%s]"
+msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "paketni (%s) olib tashlash sistemangizni ishdan chiqaradi"
-
-#: ../urpmq:1
-#, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
+msgid "unable to register rpm file"
+msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+msgid "error registering local packages"
 msgstr ""
-"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
-"%s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
+msgid "no package named %s"
+msgstr "%s nomli paket mavjud emas"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "The following packages contain %s: %s"
+msgstr "Quyidagi paketlarda %s bor: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "nomi (%s) bir hil bo'lgan bir nechta RPM-fayli mavjud"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr ""
-"  --curl         - masofadagi fayllarni olish uchun curl dasturini "
-"ishlatish.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
 
-#: ../urpmi:1
-#, c-format
-msgid "do you agree ?"
-msgstr "rozimisiz ?"
-
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr ""
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "manba (%s) RPM-fayllarning joyini aniqlamagan"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "...retrieving done"
-msgstr "...olish tugadi"
+msgid "package %s is not found."
+msgstr "%s paketi topilmadi."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "%s paketi qo'shilmoqda (id=%d, eid=%d, yangilash=%d, fayl=%s)"
+msgid "urpmi database locked"
+msgstr "urpmi ma'lumot bazasi qulflangan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "skipping package %s"
-msgstr "%s paketi tashlab o'tilmoqda"
+msgid "medium \"%s\" is not selected"
+msgstr "manba (%s) tanlanmagan"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Imzo haqiqiy emas (%s)"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "RPM-faylini (%s) manbadan (%s) o'qib bo'lmadi"
 
-#: ../urpmq:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:2574
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "unable to access medium \"%s\""
 msgstr ""
-"urpmi, versiya %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
+msgid "malformed input: [%s]"
 msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanmash.\n"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "RPM -fayllari manbadan (%s) olinmoqda..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "hdlist faylining (%s) manbasini aniqlab bo'lmadi"
+msgid "Preparing..."
+msgstr "Tayorlanmoqda..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
+msgid "using process %d for executing transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "due to conflicts with %s"
+msgid "unable to create transaction"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "Keshdagi %d eski sarlavha o'chirilmoqda"
+msgid "removing package %s"
+msgstr "%s paketi olib tashlanmoqda"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "manbani (%s) yangilab bo'lmadi\n"
+msgid "unable to remove package %s"
+msgstr "paketni (%s) olib tashlab bo'lmadi"
 
-#: ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "%s paketi qo'shilmoqda (id=%d, eid=%d, yangilash=%d, fayl=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr ""
+msgid "unable to install package %s"
+msgstr "%s paketini o'rnatib bo'lmadi"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "Preparing..."
-msgstr "Tayorlanmoqda..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
+msgid "due to missing %s"
+msgstr "%s etishmaganiga ko'ra"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3011
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - synthesis yoki hdlist faylini topishga urinmash.\n"
+msgid "trying to promote %s"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr ""
+msgid "in order to keep %s"
+msgstr "%s'ni qoldirish uchun"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
+msgid "in order to install %s"
+msgstr "%s'ni o'rnatish uchun"
 
-#: ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3049
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+msgid "unrequested"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "Imzo haqiqiy emas (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr ""
+msgid "Missing signature (%s)"
+msgstr "Imzo etishmaydi (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpm/args.pm:220
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
+
+#: ../urpm/msg.pm:80
+#, c-format
+msgid "Sorry, bad choice, try again\n"
+msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
+
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -881,613 +803,660 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
-msgid "...copying done"
-msgstr "...nusxa ko'chirish bajarildi"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to use parallel option \"%s\""
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
+"  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to access first installation medium"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "virtual medium need to be local"
+msgid "  --root         - use another root for rpm installation.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
-msgid "error registering local packages"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - paketlarni olish tezligini cheklash.\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - ortiqcha xabarlar bilan.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr ""
+msgid "unknown packages"
+msgstr "Noma'lum paketlar"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "%s'dan RPM-fayllar topilmadi"
+msgid "unknown package"
+msgstr "noma'lum paket"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr ""
+msgid "removing package %s will break your system"
+msgstr "paketni (%s) olib tashlash sistemangizni ishdan chiqaradi"
 
-#: ../urpmi:1
+#: ../urpme:95
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Quyidagi paketlarning imzolari noto'g'ri"
+msgid "Nothing to remove"
+msgstr "O'chirish uchun hech narsa yo'q"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr ""
-"mavjud bo'lgan hdlist (yoki synthesis) fayli uchun md5sum hisoblanmoqda"
+msgid "Checking to remove the following packages"
+msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
 
-#: ../urpmq:1
+#: ../urpme:106
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
 msgstr ""
+"Bog'liqliklarni ta'minlash uchun quyidagi paketlar olib tashlanadi (%d Mb)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "unable to install package %s"
-msgstr "%s paketini o'rnatib bo'lmadi"
+msgid " (y/N) "
+msgstr " (h/Y) "
 
-#: ../urpmi:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
+msgid "removing %s"
+msgstr "%s o'chirilmoqda"
+
+#: ../urpme:115
+#, c-format
+msgid "Removing failed"
+msgstr "O'chirish muvaffaqiyatsiz tugadi"
+
+#: ../urpmf:27
+#, fuzzy, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmf, versiya %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
 
-#: ../urpmi:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "Save file"
-msgstr "Faylni saqlash"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - faqat yangilash manbasidan foydalanish.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
+"foydalanish.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "moslama faylini (%s) yozib bo'lmadi"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
+"foydalanmash.\n"
 
-#: ../urpme:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
+
+#: ../urpmf:38
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr ""
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - bir hil qatorlarni ko'rsatmash.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:42
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr ""
-"  --probe-synthesis - synthesis faylini topishga va undan foydalanishga "
-"urinib ko'rish.\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - hamma teglarni ko'rsatish.\n"
 
-#: ../urpmi:1
+#: ../urpmf:43
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:44
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - size tegini ko'rsatish: hajmi.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "<relative path of hdlist> missing\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:46
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - summary tegini ko'rsatish: hisobot.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unrequested"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - description tegini ko'rsatish: ta'rifi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:48
 #, c-format
-msgid "unable to access rpm file [%s]"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - files tegini ko'rsatish: hamma fayllar.\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:51
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "O'rnatishni davom etishni istaysizmi?"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - url tegini ko'rsatish: url.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-faylini (%s) manbadan (%s) o'qib bo'lmadi"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+msgid "  --requires     - print tag requires: all requires.\n"
 msgstr ""
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "manba (%s) uchun hdlist synthesis fayli yaratildi"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - files tegini ko'rsatish: hamma fayllar.\n"
 
-#: ../urpmq:1
+#: ../urpmf:55
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:56
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmf:59
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:61
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf:62
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "unmounting %s"
-msgstr "%s uzilmoqda"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmf:64
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
-"yangilash uchun hech narsa yo'q (manbani qo'shish uchun\n"
-"urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% bajarildi, tezlik = %s"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:66
 #, c-format
-msgid "restarting urpmi"
-msgstr "urpmi qaytadan ishga tushmoqda"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:114
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "synthesis fayli (%s) tekshirilmoqda"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "...copying failed"
-msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:72
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
+"urpmi, versiya %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - xabarsiz.\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
 
-#: ../urpmf:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - sistemani yangilash uchun paketlarni avto-tanlash.\n"
 
-#: ../urpmq:1
+#: ../urpmi:85
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:88
 #, c-format
-msgid "unknown packages"
-msgstr "Noma'lum paketlar"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:91
 #, c-format
-msgid "selecting multiple media: %s"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
+msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:94
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"olib tashlash uchun hech narsa yo'q (manbani qo'shish\n"
-"uchun urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr ""
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:96
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - shu yordam xabarini ko'rsatish.\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - ishlatilmagan RPM'ni keshda saqlash.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:100
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:104
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, 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"
+msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr ""
-"urpmf, versiya %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
+"  --wget         - masofadagi fayllarni olish uchun wget dasturini "
+"ishlatish.\n"
 
-#: ../urpmf:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr ""
+"  --curl         - masofadagi fayllarni olish uchun curl dasturini "
+"ishlatish.\n"
 
-#: ../urpmf:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - bir hil qatorlarni ko'rsatmash.\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - paketlarni olish tezligini cheklash.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"--synthesis'dan --media, --excludemedia, --sortmedia, --update or --parallel "
-"bilan birga foydalanib bo'lmaydi"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "Bo'ladimi?"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - qo'llanma fayllarsiz.\n"
-
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:115
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:119
 #, c-format
-msgid "Nothing to remove"
-msgstr "O'chirish uchun hech narsa yo'q"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - X interfeysidan foydalanish.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:122
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "manbadan (%s) sarlavhalar o'qilmoqda"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid ""
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:126
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "manba (%s) RPM-fayllarning joyini aniqlamagan"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - qo'llanma fayllarsiz.\n"
 
-#: ../urpmf:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgid "  -a             - select all matches on command line.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "unable to write list file of \"%s\""
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - description tegini ko'rsatish: ta'rifi.\n"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:132
 #, c-format
-msgid "Copying failed"
-msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - xabarsiz.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:134
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi:141
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
+msgid "Choose location to save file"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "manbada (%s) hech qanday hdlist fayli topilmadi"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:204
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:212
 #, c-format
-msgid "installing %s"
-msgstr "%s o'rnatilmoqda"
+msgid "Do nothing"
+msgstr "Hech narsa qilmash"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "RPM-fayllari %s'dan o'qilmoqda"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr ""
+msgid "Save file"
+msgstr "Faylni saqlash"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 
-#: ../urpme:1
+#: ../urpmi:230
 #, c-format
-msgid "Removing failed"
-msgstr "O'chirish muvaffaqiyatsiz tugadi"
+msgid "Install it"
+msgstr "O'rnatish"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:239
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "package %s is not found."
-msgstr "%s paketi topilmadi."
+msgid "Unable to create directory [%s] for bug report"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "manba (%s) o'chirilmoqda"
+msgid "Copying failed"
+msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:260
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr ""
+msgid "Only superuser is allowed to install packages"
+msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "Cancel"
-msgstr "Bekor qilish"
+msgid "One of the following packages is needed:"
+msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:403
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
+msgid "What is your choice? (1-%d) "
+msgstr "Nimani tanlaysiz? (1-%d) "
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
+msgid "Package installation..."
+msgstr "Paketni o'rnatish..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
+msgid "Initializing..."
+msgstr "Ishga tayorlanmoqda..."
 
-#: ../urpm.pm:1
+#: ../urpmi:435
 #, c-format
-msgid "unable to access medium \"%s\""
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
+"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "manbani (%s) yaratib bo'lmadi\n"
+msgid "do you agree ?"
+msgstr "rozimisiz ?"
 
-#: ../urpmf:1
+#: ../urpmi:455
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
+"O'rnatishni davom etib bo'lmaydi, chunki boshqalarni yangilash\n"
+"uchun quyidagi paketlarni olib tashlash kerak:\n"
+"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:461
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
+"Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
+"%s"
 
-#: ../urpmi:1
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d Mb)"
+
+#: ../urpmi:505
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1496,398 +1465,474 @@ msgstr ""
 "Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --changelog    - print changelog.\n"
+msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:540
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Iltimos \"%s\" nomli manbani [%s] uskunasiga qo'ying"
 
-#: ../urpmf:1
+#: ../urpmi:541
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
+msgid "Press Enter when ready..."
+msgstr "Tayor bo'lganda ENTER tugmasini bosing..."
+
+#: ../urpmi:585
+#, c-format
+msgid "Downloading package `%s'..."
+msgstr "\"%s\" paketi olinmoqda..."
+
+#: ../urpmi:597
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% %s dan bajarildi, ETA = %s, tezlik = %s"
+
+#: ../urpmi:600
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% bajarildi, tezlik = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Quyidagi paketlarning imzolari noto'g'ri"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "O'rnatishni davom etishni istaysizmi?"
+
+#: ../urpmi:640 ../urpmi:767
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
 msgstr ""
+"O'rnatish muvaffaqiyatsiz tugadi, ba'zi bir fayllar etishmaydi:\n"
+"%s\n"
+"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../urpm.pm:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
+msgid "Installation failed"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpmi:665
+#, c-format
+msgid "distributing %s"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "hdlist fayli (%s) tekshirilmoqda"
+msgid "installing %s"
+msgstr "%s o'rnatilmoqda"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "copying hdlists file..."
-msgstr "hdlists faylidan nusxa ko'chirilmoqda..."
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:772
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgid "%d installation transactions failed"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:780
 #, c-format
-msgid "Do nothing"
-msgstr "Hech narsa qilmash"
+msgid "Installation is possible"
+msgstr "O'rnatish mumkin"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr ""
+msgid "Everything already installed"
+msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../urpm.pm:1
+#: ../urpmi:797
 #, c-format
-msgid "mounting %s"
-msgstr "%s ulanmoqda"
+msgid "restarting urpmi"
+msgstr "urpmi qaytadan ishga tushmoqda"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
 msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "unable to get source packages, aborting"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - yangilash manbasini yaratish.\n"
+
+#: ../urpmi.addmedia:56
+#, c-format
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
+"  --probe-synthesis - synthesis faylini topishga va undan foydalanishga "
+"urinib ko'rish.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr ""
+"  --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
+"ko'rish.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% %s dan bajarildi, ETA = %s, tezlik = %s"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - synthesis yoki hdlist faylini topishga urinmash.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"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"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"urpmq, versiya %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:70
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "  -g             - print groups with name also.\n"
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "manba (%s) tanlanmagan"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - sarlavhalarning kesh direktoriyasini tozalash.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "  -f             - force generation of hdlist files.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgid "cannot add updates of a cooker distribution\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "retrieving mirrors at %s ..."
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "manbani (%s) yangilab bo'lmadi\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
+msgid "<relative path of hdlist> missing\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+msgid "`with' missing for network media\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - group tegini ko'rsatish: guruh.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "manbani (%s) yaratib bo'lmadi\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"  --media        - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanish.\n"
+"Foydalanish: urpmi.removemedia [-a] <nom>...\n"
+"<nom> - olib tashlanadigan manbaning nomi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "unable to create transaction"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - hamma manbalarni tanlash.\n"
+
+#: ../urpmi.removemedia:39
+#, c-format
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
+"\n"
+"noma'lum parametrlar \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM -fayllari manbadan (%s) olinmoqda..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr ""
+"olib tashlash uchun hech narsa yo'q (manbani qo'shish\n"
+"uchun urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"olib tashlash parametri etishmayapti\n"
+"(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+msgid "  --update       - update only update media.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "moslama fayli (%s) yozilmoqda"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
+"yangilash uchun hech narsa yo'q (manbani qo'shish uchun\n"
+"urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
+"yangilash parametri etishmayapti\n"
+"(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf, versiya %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Iltimos \"%s\" nomli manbani [%s] uskunasiga qo'ying"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - yangilash manbasini yaratish.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "%s o'chirilmoqda"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmq:62
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - size tegini ko'rsatish: hajmi.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s'ni qoldirish uchun"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "due to unsatisfied %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"Paketlarni avtomatik ravishda o'rnatish...\n"
-"Siz o'rnatishni talab qildingan paket: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi ma'lumot bazasi qulflangan"
+msgid "  --changelog    - print changelog.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -d             - extend query to package dependencies.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
+msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgid "  -g             - print groups with name also.\n"
 msgstr ""
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
+msgid "  -r             - print version and release with name also.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr ""
-"  --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
-"ko'rish.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - paketdagi fayllarni ko'rsatish.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "%s etishmaganiga ko'ra"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - faqat yangilash manbasidan foydalanish.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+msgid "No filelist found\n"
 msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
+msgid "No changelog found\n"
 msgstr ""
-"  --test         - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "%s'ni o'rnatish uchun quyidagi paketlardan biri kerak:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq, versiya %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+#~ "\n"
+#~ "Foydalanish:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Noma'lum webfetch \"%s\" !!!\n"
diff --git a/po/vi.po b/po/vi.po
index a55054a7..26af2d54 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-01-28 21:57+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -32,869 +32,784 @@ msgstr "YyVvDdCc"
 msgid "Nn"
 msgstr "NnKk"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "đang cài đặt %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - tự động tạo mọi phương tiện từ một phương tiện cài\n"
-"                     đặt.\n"
+"Tự động cài đặt các gói...\n"
+"Bạn yêu cầu cài đặt gói %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "không thể mở rpmdb"
+msgid "Is this OK?"
+msgstr "Đồng ý không?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - in thông tin trợ giúp này.\n"
+msgid "Ok"
+msgstr "OK"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "Cần một gói trong các gói %s sau đây để cài đặt:"
+msgid "Cancel"
+msgstr "Bỏ qua"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "gỡ bỏ gói %s"
+msgid " (Y/n) "
+msgstr " (Có/Không) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "%s: command not found\n"
+msgstr "%s: không thấy lệnh\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Không thể dùng parallel mode với use-distrib mode"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - in thông tin trợ giúp này.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
-#, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - xoá thư mục cache headers.\n"
+#: ../rpm-find-leaves:14
+#, fuzzy, c-format
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  --group         - in ra nhóm tag: nhóm.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using process %d for executing transaction"
-msgstr "dùng tiến trình %d để thực thi phiên giao dịch"
+#: ../rpm-find-leaves:15
+#, fuzzy, c-format
+msgid "                    defaults is %s.\n"
+msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
+msgid "unknown protocol defined for %s"
+msgstr "chỉ định giao thức không xác định cho %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Bạn lựa chọn gì? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "tìm thấy các header %d trong cache"
+msgid "unable to handle protocol: %s"
+msgstr "không thể quản lý giao thức: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "có nhiều gói với cùng tên tập tin rpm \"%s\""
+msgid "syntax error in config file at line %s"
+msgstr "lỗi cú pháp trong tập cấu hình tại dòng %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:174
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
-"  --proxy-user   - chỉ định người dùng và mật khẩu cho proxy\n"
-"                   xác thực (khuôn dạng là <user:password>).\n"
+"phương tiện \"%s\" cố sử dụng danh sách đĩa cứng (hdlist) đang dùng rồi, "
+"phương tiện bị bỏ qua"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "thực hiện pass thứ hai để tính toán các phụ thuộc\n"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"phương tiện \"%s\" cố sử dụng một danh sách đang dùng, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:196
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "đang thu thập tập tin rpm [%s] ..."
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr ""
+"không thể quản lý phương tiện \"%s\" vì tập tin danh sách đã được phương "
+"tiện khác dùng rồi"
 
-#: ../urpmq:1
+#: ../urpm.pm:202
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - liệt kê các alias song song hiện có.\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"không thể dùng tên \"%s\" cho phương tiện chưa có tên vì nó đã được dùng rồi"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:209
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...không thu thập được: %s"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"không nhận được phương tiện \"%s\" vào tài khoản do không tồn tại tập tin "
+"danh sách [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:213
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "không thể xem xét tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr ""
+"không thể xác định phương tiện của tập tin danh sách đĩa cứng (hdlist) [%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:222
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
-"  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
+"không thể truy cập tập tin danh sách đĩa cứng (hdlist) của \"%s\", phương "
+"tiện bị bỏ qua"
 
-#: ../urpmi:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "Package installation..."
-msgstr "Cài đặt gói..."
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "không thể truy cập tập tin danh sách của \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "tên tập tin rpm [%s] không hợp lệ"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "đang cố bỏ qua phương tiện đang tồn tại \"%s\", tránh"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:257
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "khai báo proxy sai trong dòng lệnh\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr ""
+"phương tiện ảo \"%s\" không nên có tập tin danh sách hay hdlist được định "
+"ra, phương tiện bị bỏ qua"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d phiên giao dịch cài đặt lỗi"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "phương tiện ảo \"%s\" nên có URL rõ ràng, phương tiện bị bỏ qua"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
-"không thể truy cập phương tiện cài đặt đầu tiên (tập tin Mandrake/base/"
-"hdlists không tìm được)"
+"không thể tìm được tập tin danh sách đĩa cứng (hdlist) cho \"%s\", phương "
+"tiện bị bỏ qua"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Xin lỗi, lựa chọn sai, hãy thử lại\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "không thể tìm thấy tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "Choose location to save file"
-msgstr ""
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "tập tin danh sách không rõ ràng cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpmf:1
+#: ../urpm.pm:309
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "không thể xem xét tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:342
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Các gói tin sau đây chứa %s: %s"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "có quá nhiều điểm gắn kết cho phương tiện tháo lắp \"%s\""
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid "Install it"
-msgstr "Cài đặt không được"
+#: ../urpm.pm:343
+#, c-format
+msgid "taking removable device as \"%s\""
+msgstr "coi phương tiện tháo lắp là \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - dùng giao diện X.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Cần một gói trong các gói tin sau đây:"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "không thể thu thập tên đường dẫn cho phương tiện tháo lắp \"%s\""
 
-#: ../urpme:1
+#: ../urpm.pm:368
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "Để thỏa mãn các phụ thuộc, các gói sau đây sẽ được gỡ bỏ (%d MB)"
+msgid "unable to write config file [%s]"
+msgstr "Không thể ghi tập tin cấu hình [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - hãy chọn giao diện tốt nhất theo môi trường:\n"
-"                   chế độ X hay văn bản.\n"
+msgid "write config file [%s]"
+msgstr "ghi tập tin cấu hình [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Đang tải về gói `%s'..."
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Không thể dùng parallel mode với use-distrib mode"
 
-#: ../urpmi:1
+#: ../urpm.pm:412
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "Cái có thể được làm bằng các tập tin nhị phân khi dùng --install-src"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:423
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - tự động chọn các gói tin để nâng cấp hệ thống.\n"
+msgid "examining parallel handler in file [%s]"
+msgstr "đang kiểm tra trình quản lý song song (parallel) trong tập tin [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:433
 #, c-format
-msgid "no package named %s"
-msgstr "không có gói tin với tên %s"
+msgid "found parallel handler for nodes: %s"
+msgstr "tìm thấy trình quản lý song song (parallel) cho các node: %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:437
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - chọn toàn bộ các tương hợp trong dòng lệnh.\n"
+msgid "using associated media for parallel mode: %s"
+msgstr "đang dùng phương tiện liên quan cho chế độ song song: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Cài đặt lỗi, thiếu một số tập tin:\n"
-"%s\n"
-"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
+msgid "unable to use parallel option \"%s\""
+msgstr "không thể sử dụng tùy chọn song song (parallel) \"%s\""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"cách dùng: urpmi.removemedia [-a] <tên> ...\n"
-"nơi mà <tên> là tên phương tiện muốn gỡ bỏ.\n"
+"--synthesis không thể dùng với  --media, --excludemedia, --sortmedia, --"
+"update hoặc --parallel"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"Không thể tiếp tục việc cài đặt vì các gói sau đây phải được gỡ bỏ\n"
-"để nâng cấp các gói khác:\n"
-"%s\n"
+msgid "examining synthesis file [%s]"
+msgstr "đang kiểm tra tập tin tổng hợp [%s]"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "thiếu `with' cho phương tiện mạng\n"
+msgid "examining hdlist file [%s]"
+msgstr "đang kiểm tra tập tin danh sách đĩa cứng (hdlist) [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "phương tiện ảo \"%s\" không phải cục bộ, phương tiện bị bỏ qua"
 
-#: ../urpme:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "unknown package"
-msgstr "gói tin không xác định"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "trục trặc khi đọc tập tin synthesis hay hdlist của phương tiện \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "Installation is possible"
-msgstr "Có khả năng cài đặt"
+msgid "performing second pass to compute dependencies\n"
+msgstr "thực hiện pass thứ hai để tính toán các phụ thuộc\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
-"%s"
+msgid "skipping package %s"
+msgstr "bỏ qua gói tin %s"
 
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "Để thỏa mãn các phụ thuộc, những gói sau đây sẽ được cài đặt (%d MB)"
+#: ../urpm.pm:572
+#, c-format
+msgid "would install instead of upgrade package %s"
+msgstr "nên cài đặt thay vì nâng cấp gói %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"không nhận được phương tiện \"%s\" vào tài khoản do không tồn tại tập tin "
-"danh sách [%s]"
+msgid "unable to open rpmdb"
+msgstr "không thể mở rpmdb"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid " (y/N) "
-msgstr " (Có/Không) "
+msgid "medium \"%s\" already exists"
+msgstr "phương tiện \"%s\" đã tồn tại rồi"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:629
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "không thể thêm các cập nhật của phiên bản cooker\n"
+msgid "virtual medium need to be local"
+msgstr "phương tiện ảo phải là cục bộ "
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:661
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - chế độ verbose.\n"
+msgid "added medium %s"
+msgstr "đã thêm phương tiện %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:677
 #, c-format
-msgid "Initializing..."
-msgstr "Đang khởi tạo..."
+msgid "unable to access first installation medium"
+msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
 
-#: ../urpmq:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - liệt kê các gói tin hiện có.\n"
+msgid "copying hdlists file..."
+msgstr "đang sao chép tập tin danh sách đĩa cứng (hdlist)..."
 
-#: ../urpmf:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - in ra toàn bộ tag.\n"
+msgid "...copying failed"
+msgstr "...sao chép không được"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr ""
-"phương tiện không rõ ràng \"%s\" được đánh dấu là tháo lắp nhưng không phải "
-"vậy"
+msgid "...copying done"
+msgstr "...sao chép hoàn thành"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
 msgstr ""
-"phương tiện ảo \"%s\" không nên có tập tin danh sách hay hdlist được định "
-"ra, phương tiện bị bỏ qua"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "tính toán md5sum của hdlist nguồn được sao chép (hoặc tổng hợp)"
+"không thể truy cập phương tiện cài đặt đầu tiên (tập tin Mandrake/base/"
+"hdlists không tìm được)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - gồm đường dẫn được tách biệt bằng dấu phẩy.\n"
+msgid "retrieving hdlists file..."
+msgstr "đang thu thập tập tin hdlists..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Nhấn Enter khi sẵn sàng ..."
+msgid "...retrieving done"
+msgstr "...hoàn thành việc thu thập"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tùy chọn không xác định '%s'\n"
+msgid "...retrieving failed: %s"
+msgstr "...không thu thập được: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - tách làm phiên giao dịch nhỏ nếu có nhiều hơn các gói "
-"được\n"
-"                   có sẽ được cài đặt hay nâng cấp,\n"
-"                   mặc định là %d.\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "mô tả hdlist không hợp lệ \"%s\" trong tập tin hdlists"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "trục trặc khi đọc tập tin synthesis hay hdlist của phương tiện \"%s\""
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - dùng wget để thu thập các tập tin ở xa.\n"
+msgid "selecting multiple media: %s"
+msgstr "đang chọn đa phương tiện: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - cho phép tìm gói tin trong số các nhà cung cấp.\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - liệt kê các node hiện có khi dùng --parallel.\n"
+msgid "removing medium \"%s\""
+msgstr "gỡ bỏ phương tiện \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "xây dựng hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"không thể truy cập phương tiện \"%s\",\n"
+"Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"  --keep         - giữ gói đang tồn tại nếu có thể, bỏ các gói yêu cầu\n"
-"                   dẫn đến việc gỡ bỏ.\n"
+"phương tiện ảo \"%s\" nên có nguồn hdlist hoặc synthesis hợp lệ, phương tiện "
+"bị bỏ qua"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "đang kiểm tra tập tin MD5SUM"
+msgid "copying description file of \"%s\"..."
+msgstr "đang sao chép tập tin mô tả của \"%s\"..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: không thấy lệnh\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "tính toán md5sum của hdlist nguồn hiện có (hoặc tổng hợp)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "không thể đăng ký tập tin rpm"
+msgid "examining MD5SUM file"
+msgstr "đang kiểm tra tập tin MD5SUM"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - cho phép hỏi người dùng cài đặt các gói tin\n"
-"                   mà không kiểm tra các phụ thuộc.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "đang sao chép hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "không thể quản lý giao thức: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "đang thu thập tập tin hdlists..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "tính toán md5sum của hdlist nguồn được sao chép (hoặc tổng hợp)"
 
-#: ../urpmi:1
-#, c-format
-msgid "Yes, really install it"
-msgstr ""
+#: ../urpm.pm:1111
+#, fuzzy, c-format
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "bản sao của [%s] hỏng"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "đã thêm phương tiện %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "trục trặc khi đọc tập tin tổng hợp của phương tiện \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - giữ rpm không được dùng trong cache.\n"
+msgid "reading rpm files from [%s]"
+msgstr "đang đọc các tập tin rpm từ [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"đã tạo phiên giao dịch cho việc cài đặt trên %s (gỡ bỏ=%d, cài đặt=%d, nâng "
-"cấp=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "không thể đọc các tập tin rpm từ [%s]: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum không khớp"
+msgid "no rpm files found from [%s]"
+msgstr "không tìm thấy các tập tin rpm từ [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "lỗi cú pháp trong tập cấu hình tại dòng %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "đang thu thập hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  tên hay tập tin rpm có trong dòng lệnh sẽ được cài đặt.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "đã thấy hdlist được dò tìm (hoặc tổng hợp) là %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - dùng chỉ định HTTP proxy, số hiệu port được gán\n"
-"                    là 1080 theo mặc định (định dạng là <proxyhost[:port]"
-">).\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "tính toán md5sum của hdlist nguồn thu thập được (hoặc tổng hợp)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "để cài đặt %s"
+msgid "md5sum mismatch"
+msgstr "md5sum không khớp"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "các mục nhập %s được đặt lại trong danh sách các phụ thuộc"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "không thu thập được hdlist nguồn (hoặc tổng hợp)"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "tập tin [%s] đang được dùng trong cùng phương tiện \"%s\" rồi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "nên cài đặt thay vì nâng cấp gói %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "không thể phân tích tập tin hdlist của \"%s\""
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "đang thu thập các mirror tại %s ..."
+msgid "unable to write list file of \"%s\""
+msgstr "không thể ghi tập danh sách của \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - in ra tag url: url.\n"
+msgid "writing list file for medium \"%s\""
+msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "chỉ định giao thức không xác định cho %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "không có gì được ghi trong tập tin danh sách cho \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-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"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "phương tiện \"%s\" đã tồn tại rồi"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "không thể nhập tập tin pubkey của \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "đang cài đặt %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "đang đọc các header từ phương tiện \"%s\""
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"thiếu mục cập nhật\n"
-"(một mục của %s)\n"
+msgid "building hdlist [%s]"
+msgstr "xây dựng hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "thử xúc tiến %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "xây dựng tập tin tổng hợp hdlist cho phương tiện \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "không thể gỡ bỏ gói %s"
+msgid "found %d headers in cache"
+msgstr "tìm thấy các header %d trong cache"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "trục trặc khi đọc tập tin tổng hợp của phương tiện \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "đang gỡ bỏ các header cũ %d trong cache"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"mục nhập để gỡ bỏ đang thiếu\n"
-"(một mục cho %s)\n"
+msgid "mounting %s"
+msgstr "gắn kết %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - chọn toàn bộ các phương tiện.\n"
+msgid "unmounting %s"
+msgstr "thôi gắn kết %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "Thiếu chữ ký (%s)"
+msgid "relocated %s entries in depslist"
+msgstr "các mục nhập %s được đặt lại trong danh sách các phụ thuộc"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "không thể đọc các tập tin rpm từ [%s]: %s"
+msgid "no entries relocated in depslist"
+msgstr "không có các mục nhập được đặt lại trong danh sách các phụ thuộc"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - phân phối urpmi qua các máy của alias.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "tên tập tin rpm [%s] không hợp lệ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr ""
+msgid "retrieving rpm file [%s] ..."
+msgstr "đang thu thập tập tin rpm [%s] ..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - chỉ cập nhật phương tiện cập nhật.\n"
+msgid "unable to access rpm file [%s]"
+msgstr "không thể truy cập tập tin rpm [%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr " (Có/Không) "
+msgid "unable to register rpm file"
+msgstr "không thể đăng ký tập tin rpm"
 
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  --group         - in ra nhóm tag: nhóm.\n"
+#: ../urpm.pm:1963
+#, c-format
+msgid "error registering local packages"
+msgstr "lỗi đăng ký các gói tin cục bộ"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"phương tiện \"%s\" cố sử dụng một danh sách đang dùng, phương tiện bị bỏ qua"
+msgid "no package named %s"
+msgstr "không có gói tin với tên %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "input bất thường: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "Các gói tin sau đây chứa %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "có nhiều gói với cùng tên tập tin rpm \"%s\""
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - liệt kê phương tiện hiệc có.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "không thể phân tích đúng [%s] trên giá trị \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"Không thể cài đặt một số gói tin được yêu cầu:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Đang cài đặt gói `%s' (%s/%s)..."
+"phương tiện \"%s\" dùng tập tin danh sách không hợp lệ:\n"
+"  có thể mirror không được cập nhật, đang thử dùng phương pháp thay thế khác"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "không có các mục nhập được đặt lại trong danh sách các phụ thuộc"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "phương tiện \"%s\" không chỉ ra bất kỳ vị trí nào cho các tập tin rpm"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - chỉ cài đặt gói nguồn (không cài gói nhị phân).\n"
+msgid "package %s is not found."
+msgstr "Không tìm thấy gói tin %s."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - dùng curl để thu thập các tập tin ở xa.\n"
+msgid "urpmi database locked"
+msgstr "cơ sở dữ liệu urpmi bị khóa"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
+msgid "medium \"%s\" is not selected"
+msgstr "phương tiện \"%s\" không được chọn"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "Đồng ý không ?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "không thể đọc tập tin rpm [%s] từ phương tiện \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "tập tin danh sách không rõ ràng cho \"%s\", phương tiện bị bỏ qua"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr ""
+"phương tiện không rõ ràng \"%s\" được đánh dấu là tháo lắp nhưng không phải "
+"vậy"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...hoàn thành việc thu thập"
+msgid "unable to access medium \"%s\""
+msgstr "không thể truy cập phương tiện \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "thêm gói %s (id=%d, eid=%d, cập nhật=%d, tập tin=%s)"
+msgid "malformed input: [%s]"
+msgstr "input bất thường: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "bỏ qua gói tin %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Chữ ký không hợp lệ (%s)"
+msgid "Preparing..."
+msgstr "Đang chuẩn bị..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-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"
+msgid "using process %d for executing transaction"
+msgstr "dùng tiến trình %d để thực thi phiên giao dịch"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 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 urpmi %s\n"
-"Bản quyền (C) 1999, 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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "không thể phân tích đúng [%s] trên giá trị \"%s\""
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"  --excludemedia - không dùng phương tiện được trao, ngăn cách bởi dấu "
-"phẩy.\n"
+"đã tạo phiên giao dịch cho việc cài đặt trên %s (gỡ bỏ=%d, cài đặt=%d, nâng "
+"cấp=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr ""
-"không thể xác định phương tiện của tập tin danh sách đĩa cứng (hdlist) [%s]"
+msgid "unable to create transaction"
+msgstr "không thể tạo phiên giao dịch"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "không thể phân tích tập tin hdlist của \"%s\""
+msgid "removing package %s"
+msgstr "gỡ bỏ gói %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"phương tiện \"%s\" cố sử dụng danh sách đĩa cứng (hdlist) đang dùng rồi, "
-"phương tiện bị bỏ qua"
+msgid "unable to remove package %s"
+msgstr "không thể gỡ bỏ gói %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "vì xung đột với %s"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "thêm gói %s (id=%d, eid=%d, cập nhật=%d, tập tin=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "đang gỡ bỏ các header cũ %d trong cache"
+msgid "unable to install package %s"
+msgstr "không thể cài đặt gói %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "không thể cập nhật phương tiện \"%s\"\n"
+msgid "due to missing %s"
+msgstr "do thiếu %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
+msgid "due to unsatisfied %s"
+msgstr "vì không thỏa mãn %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "phương tiện ảo \"%s\" không phải cục bộ, phương tiện bị bỏ qua"
+msgid "trying to promote %s"
+msgstr "thử xúc tiến %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "Preparing..."
-msgstr "Đang chuẩn bị..."
-
-#: ../rpm-find-leaves:1
-#, fuzzy, c-format
-msgid "                    defaults is %s.\n"
-msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
+msgid "in order to keep %s"
+msgstr "để giữ %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
+msgid "in order to install %s"
+msgstr "để cài đặt %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3047
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe      - không thử tìm bất kỳ tập tin hdlist hoặc\n"
-"                   synthesis.\n"
+msgid "due to conflicts with %s"
+msgstr "vì xung đột với %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - không tìm các nhà cung cấp để kiếm gói tin.\n"
-
-#: ../urpm.pm:1
-#, fuzzy, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "bản sao của [%s] hỏng"
+msgid "unrequested"
+msgstr "thôi yêu cầu"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - cấu hình nhanh urpmi từ một distrib tree.\n"
-"                   Việc này cho phép tra vấn một distro.\n"
+msgid "Invalid signature (%s)"
+msgstr "Chữ ký không hợp lệ (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
+msgid "Invalid Key ID (%s)"
+msgstr "Key ID không hợp lệ (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean          - gỡ bỏ rpm khỏi cache trước tiên.\n"
+msgid "Missing signature (%s)"
+msgstr "Thiếu chữ ký (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr ""
-"không thể dùng tên \"%s\" cho phương tiện chưa có tên vì nó đã được dùng rồi"
+msgid "bad proxy declaration on command line\n"
+msgstr "khai báo proxy sai trong dòng lệnh\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr ""
-"phương tiện ảo \"%s\" nên có nguồn hdlist hoặc synthesis hợp lệ, phương tiện "
-"bị bỏ qua"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Xin lỗi, lựa chọn sai, hãy thử lại\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -911,1075 +826,1206 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - in thông tin trợ giúp này.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - tự động chọn một gói tin trong các gói.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"cách dùng:  urpmi.addmedia [tùy chọn] <tên> <url> [with <đường dẫn_liên "
-"quan>]\n"
-"nơi mà <url> là một trong\n"
-"       file://<đường dẫn>\n"
-"       ftp://<đăng nhập>:<mật khẩu>@<máy chủ>/<đường dẫn> with <tên tệp tin "
-"của hdlist>\n"
-"       ftp://<máy chủ>/<đường dẫn> with <tên tệp tin liên quan của hdlist>\n"
-"       http://<máy chủ/<đường dẫn> with <tên tệp tin liên quan của hdlist>\n"
-"       removable://<đường dẫn>\n"
-"\n"
-"và [tùy chọn] là từ\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "đang sao chép hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
+"tại.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...sao chép hoàn thành"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - phân phối urpmi qua các máy của alias.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "không thể sử dụng tùy chọn song song (parallel) \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"phương tiện \"%s\" dùng tập tin danh sách không hợp lệ:\n"
-"  có thể mirror không được cập nhật, đang thử dùng phương pháp thay thế khác"
+"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
+"                   cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - chế độ verbose.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "phương tiện ảo phải là cục bộ "
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "lỗi đăng ký các gói tin cục bộ"
+msgid "unknown packages"
+msgstr "các gói tin không xác định "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - giới hạn tốc độ tải xuống.\n"
+msgid "unknown package"
+msgstr "gói tin không xác định"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "đã thấy hdlist được dò tìm (hoặc tổng hợp) là %s"
+msgid "removing package %s will break your system"
+msgstr "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "không thu thập được hdlist nguồn (hoặc tổng hợp)"
+msgid "Nothing to remove"
+msgstr "Không có gì để gỡ bỏ"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "không tìm thấy các tập tin rpm từ [%s]"
+msgid "Checking to remove the following packages"
+msgstr "Đang kiểm tra để gỡ bỏ các gói tin sau đây"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "không có gì được ghi trong tập tin danh sách cho \"%s\""
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "Để thỏa mãn các phụ thuộc, các gói sau đây sẽ được gỡ bỏ (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Các gói tin sau đây có các chữ ký tồi"
+msgid " (y/N) "
+msgstr " (Có/Không) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "tính toán md5sum của hdlist nguồn hiện có (hoặc tổng hợp)"
+msgid "removing %s"
+msgstr "gỡ bỏ %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - hoàn thành output với gói sẽ được gỡ bỏ.\n"
+msgid "Removing failed"
+msgstr "Gỡ bỏ không được"
+
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 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 urpmf %s\n"
+"Bản quyền (C) 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"
+"Cách dùng:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "không thể cài đặt gói %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media         - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - không dùng phương tiện được trao, ngăn cách bởi dấu "
+"phẩy.\n"
+
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --allow-force  - cho phép hỏi người dùng cài đặt các gói tin mà\n"
-"                   không kiểm tra các phụ thuộc và tính toàn vẹn.\n"
+"  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
+"cách bởi dấu phẩy.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
+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"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - phương thức verbose.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "Không thể ghi tập tin cấu hình [%s]"
+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 tag (mặc định nếu không đưa tag vào\n"
+"                   dòng lệnh, không tương thích với chế độ tương tác).\n"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Key ID không hợp lệ (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - in ra toàn bộ tag.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
-"tại.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - in ra nhóm tag: nhóm.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "không thể thu thập tên đường dẫn cho phương tiện tháo lắp \"%s\""
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - in ra kích thước tag: kích thước.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - thử tìm và sử dụng tập tin synthesis.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - in ra tag epoch: epoch.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - ép buộc cập nhật cho gpg key.\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - in ra mô tả tag: mô tả.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "thiếu <đường dẫn liên quan của hdlist> \n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Đang kiểm tra để gỡ bỏ các gói tin sau đây"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - in ra tag packager: packager.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "thôi yêu cầu"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "không thể truy cập tập tin rpm [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - in ra tag url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - in ra tập tin tag: toàn bộ các tập tin.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Bạn muốn tiếp tục cài đặt không ?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - in ra tập tin tag: toàn bộ các tập tin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "không thể đọc tập tin rpm [%s] từ phương tiện \"%s\""
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
-"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
-"                   cài đặt chroot bằng tùy chọn --root.\n"
+"  --env          - dùng môi trường riêng (điển hình là báo cáo\n"
+"                    lỗi).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "xây dựng tập tin tổng hợp hdlist cho phương tiện \"%s\""
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - in ra thông tin có ích mà người dùng đọc được.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - dùng phiên bản được chỉ định, mặc định được lấy từ\n"
-"                   phiên bản của phân phối được nói bởi gói phát hành\n"
-"                   Mandrake đã cài đặt.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - dùng url chỉ định cho danh sách các mirror, mặc định là\n"
-"                   %s\n"
+"  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
-"                   cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
+"  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - unary NOT, đúng nếu expression là sai.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - dấu ngoặc trái để mở group expression.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+"callback is :\n"
+"%s\n"
 msgstr ""
-"Thư mục [%s] đã tồn tại rồi, hãy dùng thư mục khác để ghi báo cáo lỗi hoặc "
-"xóa thư mục đó đi"
+"callback là :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "thôi gắn kết %s"
+msgid "using specific environment on %s\n"
+msgstr "đang dùng môi trường đặc hiệu trên %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% đã hoàn thành, tốc độ = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 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 urpmi %s\n"
+"Bản quyền (C) 1999, 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"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "khởi chạy lại urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "đang kiểm tra tập tin tổng hợp [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - tự động chọn các gói tin để nâng cấp hệ thống.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - không bao giờ đề nghị gỡ cài đặt một gói, huỷ bỏ việc cài "
+"đặt.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...sao chép không được"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - giữ gói đang tồn tại nếu có thể, bỏ các gói yêu cầu\n"
+"                   dẫn đến việc gỡ bỏ.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"không thể truy cập tập tin danh sách đĩa cứng (hdlist) của \"%s\", phương "
-"tiện bị bỏ qua"
+"  --split-level  - tách làm phiên giao dịch nhỏ nếu có nhiều hơn các gói "
+"được\n"
+"                   có sẽ được cài đặt hay nâng cấp,\n"
+"                   mặc định là %d.\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - chế độ yên lặng.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - độ dài phiên giao dịch nhỏ, mặc định là %d.\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - phương thức verbose.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy         - tác động tìm kiếm fuzzy (giống như -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - đưa toàn bộ các gói nguồn trước khi tải xuống (chỉ cho "
-"phép root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - gói tin tiếp theo là gói nguồn (giống như -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - bật ra các header cho gói được liệt kê từ urpmi db\n"
-"                   đến stdout (chỉ cho phép root).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - chỉ cài đặt gói nguồn (không cài gói nhị phân).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "các gói tin không xác định "
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean          - gỡ bỏ rpm khỏi cache trước tiên.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "đang chọn đa phương tiện: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - giữ rpm không được dùng trong cache.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-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"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - cho phép hỏi người dùng cài đặt các gói tin\n"
+"                   mà không kiểm tra các phụ thuộc.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "tập tin [%s] đang được dùng trong cùng phương tiện \"%s\" rồi"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - cho phép hỏi người dùng cài đặt các gói tin mà\n"
+"                   không kiểm tra các phụ thuộc và tính toàn vẹn.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "Không có gì để gỡ bỏ (dùng urpmi.addmedia để thêm phương tiện)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
+"                   cài đặt chroot bằng tùy chọn --root.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "không thể tìm thấy tập tin danh sách cho \"%s\", phương tiện bị bỏ qua"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - dùng wget để thu thập các tập tin ở xa.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - in thông tin trợ giúp này.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - dùng curl để thu thập các tập tin ở xa.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "tìm thấy trình quản lý song song (parallel) cho các node: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - giới hạn tốc độ tải xuống.\n"
 
-#: ../urpmf:1
-#, c-format
+#: ../urpmi:109
+#, fuzzy, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"callback là :\n"
-"%s\n"
+"  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
+"                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - đảo ngược tìm kiếm cho cái yêu cầu gói.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - dùng chỉ định HTTP proxy, số hiệu port được gán\n"
+"                    là 1080 theo mặc định (định dạng là <proxyhost[:port]"
+">).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"Phiên bản urpmf %s\n"
-"Bản quyền (C) 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"
-"Cách dùng:\n"
+"  --proxy-user   - chỉ định người dùng và mật khẩu cho proxy\n"
+"                   xác thực (khuôn dạng là <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - không in ra tên tag (mặc định nếu không đưa tag vào\n"
-"                   dòng lệnh, không tương thích với chế độ tương tác).\n"
+"  --bug          - xuất ra báo cáo lỗi trong thư mục được chỉ định\n"
+"                    bởi đối số (arg) tiếp theo.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - dùng giao diện X.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis không thể dùng với  --media, --excludemedia, --sortmedia, --"
-"update hoặc --parallel"
+"  --best-output  - hãy chọn giao diện tốt nhất theo môi trường:\n"
+"                   chế độ X hay văn bản.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - dùng kiến trúc được chỉ định, mặc định là kiến trúc của\n"
-"                   gói phát hành mandrake đã cài đặt.\n"
+"  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
+"                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Đồng ý không?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - gồm đường dẫn được tách biệt bằng dấu phẩy.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - trừ các tập tin tài liệu.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-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"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - chọn toàn bộ các tương hợp trong dòng lệnh.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "đang kiểm tra trình quản lý song song (parallel) trong tập tin [%s]"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - cho phép tìm gói tin trong số các nhà cung cấp.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "Không có gì để gỡ bỏ"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - không tìm các nhà cung cấp để kiếm gói tin.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - tác động tìm kiếm fuzzy (giống như --fuzzy.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "đang đọc các header từ phương tiện \"%s\""
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - gói tin tiếp theo kà gói nguồn (giống như --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - tra vấn mở rộng tới các phụ thuộc của gói tin.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - chế độ yên lặng.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  tên hay tập tin rpm có trong dòng lệnh sẽ được cài đặt.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
 msgstr ""
-"  --bug          - xuất ra báo cáo lỗi trong thư mục được chỉ định\n"
-"                    bởi đối số (arg) tiếp theo.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:197
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "phương tiện \"%s\" không chỉ ra bất kỳ vị trí nào cho các tập tin rpm"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "Cái có thể được làm bằng các tập tin nhị phân khi dùng --install-src"
 
-#: ../urpmf:1
+#: ../urpmi:204
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "không thể ghi tập danh sách của \"%s\""
+msgid "Do nothing"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
+msgid "Yes, really install it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
+msgid "Save file"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - in ra mô tả tag: mô tả.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../urpmi:230
+#, fuzzy, c-format
+msgid "Install it"
+msgstr "Cài đặt không được"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Sao chép không được"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Thư mục [%s] đã tồn tại rồi, hãy dùng thư mục khác để ghi báo cáo lỗi hoặc "
+"xóa thư mục đó đi"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - cố tạo các tập tin hdlist.\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "Không thể tạo thư mục [%s] cho báo cáo lỗi"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes chỉ được dùng với --parallel"
+msgid "Copying failed"
+msgstr "Sao chép không được"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
+msgid "Only superuser is allowed to install packages"
+msgstr "Chỉ cho phép người dùng cao cấp được cài đặt các gói"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - gói tin tiếp theo kà gói nguồn (giống như --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "Cần một gói trong các gói tin sau đây:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "đang cài đặt %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Bạn lựa chọn gì? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "đang đọc các tập tin rpm từ [%s]"
+msgid "Package installation..."
+msgstr "Cài đặt gói..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "đang sao chép tập tin mô tả của \"%s\"..."
+msgid "Initializing..."
+msgstr "Đang khởi tạo..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - tự động chọn một gói tin trong các gói.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Không thể cài đặt một số gói tin được yêu cầu:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Gỡ bỏ không được"
+msgid "do you agree ?"
+msgstr "Đồng ý không ?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - tạo phương tiện ảo luôn được cập nhật,\n"
-"                   chỉ cho phép tập tin:// protocol.\n"
+"Không thể tiếp tục việc cài đặt vì các gói sau đây phải được gỡ bỏ\n"
+"để nâng cấp các gói khác:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "Không tìm thấy gói tin %s."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Các gói sau đây phải được gỡ bỏ để nâng cấp các gói khác:\n"
+"%s"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "removing medium \"%s\""
-msgstr "gỡ bỏ phương tiện \"%s\""
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "Để thỏa mãn các phụ thuộc, những gói sau đây sẽ được cài đặt (%d MB)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "không cần cho --distrib vào với <đường dẫn liên quan của hdlist>"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Bỏ qua"
+msgid "unable to get source packages, aborting"
+msgstr "không thể lấy các gói nguồn, hủy bỏ"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - gói tin tiếp theo là gói nguồn (giống như -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - dùng môi trường riêng (điển hình là báo cáo\n"
-"                    lỗi).\n"
+msgid "Press Enter when ready..."
+msgstr "Nhấn Enter khi sẵn sàng ..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
-"cách bởi dấu phẩy.\n"
+msgid "Downloading package `%s'..."
+msgstr "Đang tải về gói `%s'..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "không thể truy cập phương tiện \"%s\""
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% của %s đã hoàn thành, ETA = %s, tốc độ = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "không thể tạo phương tiện \"%s\"\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% đã hoàn thành, tốc độ = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - in ra tag packager: packager.\n"
+msgid "The following packages have bad signatures"
+msgstr "Các gói tin sau đây có các chữ ký tồi"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dump cấu hình theo dạng của đối số urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Bạn muốn tiếp tục cài đặt không ?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Bạn phải là root để cài đặt các phụ thuộc sau đây:\n"
+"Cài đặt lỗi, thiếu một số tập tin:\n"
 "%s\n"
+"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - in ra changelog.\n"
+msgid "Installation failed"
+msgstr "Cài đặt không được"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "không thể truy cập tập tin danh sách của \"%s\", phương tiện bị bỏ qua"
+msgid "distributing %s"
+msgstr "phân phối %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
+msgid "installing %s"
+msgstr "đang cài đặt %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr ""
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Đang cài đặt gói `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "đang kiểm tra tập tin danh sách đĩa cứng (hdlist) [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "đang sao chép tập tin danh sách đĩa cứng (hdlist)..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
+msgid "%d installation transactions failed"
+msgstr "%d phiên giao dịch cài đặt lỗi"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "phương tiện ảo \"%s\" nên có URL rõ ràng, phương tiện bị bỏ qua"
+msgid "Installation is possible"
+msgstr "Có khả năng cài đặt"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
+msgid "restarting urpmi"
+msgstr "khởi chạy lại urpmi"
+
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
 msgstr ""
+"cách dùng:  urpmi.addmedia [tùy chọn] <tên> <url> [with <đường dẫn_liên "
+"quan>]\n"
+"nơi mà <url> là một trong\n"
+"       file://<đường dẫn>\n"
+"       ftp://<đăng nhập>:<mật khẩu>@<máy chủ>/<đường dẫn> with <tên tệp tin "
+"của hdlist>\n"
+"       ftp://<máy chủ>/<đường dẫn> with <tên tệp tin liên quan của hdlist>\n"
+"       http://<máy chủ/<đường dẫn> with <tên tệp tin liên quan của hdlist>\n"
+"       removable://<đường dẫn>\n"
+"\n"
+"và [tùy chọn] là từ\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "đang dùng phương tiện liên quan cho chế độ song song: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - tạo phương tiện cập nhật.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "gắn kết %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - thử tìm và sử dụng tập tin synthesis.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr ""
-"không thể quản lý phương tiện \"%s\" vì tập tin danh sách đã được phương "
-"tiện khác dùng rồi"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - thử tìm và sử dụng tập tin hdlist.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "không thể lấy các gói nguồn, hủy bỏ"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe      - không thử tìm bất kỳ tập tin hdlist hoặc\n"
+"                   synthesis.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - tự động tạo mọi phương tiện từ một phương tiện cài\n"
+"                     đặt.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% của %s đã hoàn thành, ETA = %s, tốc độ = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - tự động tạo phương tiện cho phần XXX của phân\n"
+"                   phối, XXX có thể là chính, phân phối, cập nhật haybất kỳ\n"
+"                   cái gì khác đã được cấu hình  ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "tính toán md5sum của hdlist nguồn thu thập được (hoặc tổng hợp)"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - dùng url chỉ định cho danh sách các mirror, mặc định là\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "không thể nhập tập tin pubkey của \"%s\""
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - dùng phiên bản được chỉ định, mặc định được lấy từ\n"
+"                   phiên bản của phân phối được nói bởi gói phát hành\n"
+"                   Mandrake đã cài đặt.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"  --no-uninstall - không bao giờ đề nghị gỡ cài đặt một gói, huỷ bỏ việc cài "
-"đặt.\n"
+"  --arch         - dùng kiến trúc được chỉ định, mặc định là kiến trúc của\n"
+"                   gói phát hành mandrake đã cài đặt.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\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"
+"  --virtual      - tạo phương tiện ảo luôn được cập nhật,\n"
+"                   chỉ cho phép tập tin:// protocol.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "đang thu thập hdlist nguồn (hoặc tổng hợp) của \"%s\"..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - không thực hiện kiểm tra tập tin MD5SUM.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - in ra các nhóm với tên.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - xoá thư mục cache headers.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "phương tiện \"%s\" không được chọn"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - cố tạo các tập tin hdlist.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Chỉ cho phép người dùng cao cấp được cài đặt các gói"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "không thể thêm các cập nhật của phiên bản cooker\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "đang dùng môi trường đặc hiệu trên %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "đang thu thập các mirror tại %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr ""
-"không thể tìm được tập tin danh sách đĩa cứng (hdlist) cho \"%s\", phương "
-"tiện bị bỏ qua"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "không cần cho --distrib vào với <đường dẫn liên quan của hdlist>"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - độ dài phiên giao dịch nhỏ, mặc định là %d.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "không thể cập nhật phương tiện \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - dấu ngoặc trái để mở group expression.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "thiếu <đường dẫn liên quan của hdlist> \n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "có quá nhiều điểm gắn kết cho phương tiện tháo lắp \"%s\""
+msgid "`with' missing for network media\n"
+msgstr "thiếu `with' cho phương tiện mạng\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "không thể tạo phương tiện \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"không thể truy cập phương tiện \"%s\",\n"
-"Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
+"cách dùng: urpmi.removemedia [-a] <tên> ...\n"
+"nơi mà <tên> là tên phương tiện muốn gỡ bỏ.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - in ra nhóm tag: nhóm.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - chọn toàn bộ các phương tiện.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media         - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "không thể tạo phiên giao dịch"
+"\n"
+"tùy chọn không xác định '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "đang thu thập các tập tin rpm từ phương tiện \"%s\"..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "Không có gì để gỡ bỏ (dùng urpmi.addmedia để thêm phương tiện)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
+"mục nhập để gỡ bỏ đang thiếu\n"
+"(một mục cho %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "phân phối %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"cách dùng: urpmi.update [tùy chọn] <tên> ...\n"
+"nơi mà <tên> là tên phương tiện để cập nhật.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "Cài đặt không được"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - chỉ cập nhật phương tiện cập nhật.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "ghi tập tin cấu hình [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - ép buộc cập nhật cho gpg key.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - chọn toàn bộ các phương tiện lắp trong.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - in ra tag epoch: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
-"                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
+"thiếu mục cập nhật\n"
+"(một mục của %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 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 urpmf %s\n"
+"Bản quyền (C) 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"
+"Cách dùng:\n"
+
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - liệt kê các gói tin hiện có.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - tạo phương tiện cập nhật.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - liệt kê phương tiện hiệc có.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - liệt kê các phương tiện hiện có và url của chúng.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - tác động tìm kiếm fuzzy (giống như --fuzzy.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dump cấu hình theo dạng của đối số urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - liệt kê các node hiện có khi dùng --parallel.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "mô tả hdlist không hợp lệ \"%s\" trong tập tin hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - liệt kê các alias song song hiện có.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "gỡ bỏ %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - bật ra các header cho gói được liệt kê từ urpmi db\n"
+"                   đến stdout (chỉ cho phép root).\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"  --distrib-XXX  - tự động tạo phương tiện cho phần XXX của phân\n"
-"                   phối, XXX có thể là chính, phân phối, cập nhật haybất kỳ\n"
-"                   cái gì khác đã được cấu hình  ;-)\n"
+"  --sources      - đưa toàn bộ các gói nguồn trước khi tải xuống (chỉ cho "
+"phép root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - in ra kích thước tag: kích thước.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+"  --use-distrib  - cấu hình nhanh urpmi từ một distrib tree.\n"
+"                   Việc này cho phép tra vấn một distro.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "để giữ %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - in ra changelog.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "vì không thỏa mãn %s"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - tra vấn mở rộng tới các phụ thuộc của gói tin.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Tự động cài đặt các gói...\n"
-"Bạn yêu cầu cài đặt gói %s\n"
+"  -u              - bỏ gói tin nếu có phiên bản mới hơn đã được cài đặt "
+"rồi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "cơ sở dữ liệu urpmi bị khóa"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
-"                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - hoàn thành output với gói sẽ được gỡ bỏ.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - đảo ngược tìm kiếm cho cái yêu cầu gói.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - không thực hiện kiểm tra tập tin MD5SUM.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - in ra thông tin có ích mà người dùng đọc được.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "coi phương tiện tháo lắp là \"%s\""
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - in ra các nhóm với tên.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
+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"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy         - tác động tìm kiếm fuzzy (giống như -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u              - bỏ gói tin nếu có phiên bản mới hơn đã được cài đặt "
-"rồi.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - thử tìm và sử dụng tập tin hdlist.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes chỉ được dùng với --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "do thiếu %s"
+msgid "skipping media %s: no hdlist\n"
+msgstr ""
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "No changelog found\n"
 msgstr ""
-"cách dùng: urpmi.update [tùy chọn] <tên> ...\n"
-"nơi mà <tên> là tên phương tiện để cập nhật.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "đang cố bỏ qua phương tiện đang tồn tại \"%s\", tránh"
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "Cần một gói trong các gói %s sau đây để cài đặt:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Webfetch không xác định `%s' !!!\n"
diff --git a/po/wa.po b/po/wa.po
index fc5f0dcd..57a573b1 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2003-05-13 12:50+0200\n"
 "Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -39,2019 +39,2065 @@ msgstr "OoAaYyWw"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "dj' astale %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
 msgstr ""
-"  --distrib      - fé otomaticmint tos les sopoirts a pårti d' on sopoirt\n"
-"                   d' astalåcion.\n"
+"Astalaedje otomatike des pacaedjes...\n"
+"Vos avoz dmandé l' astalaedje do pacaedje %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "dji n' sai drovi l' båze rpmdb"
+msgid "Is this OK?"
+msgstr "Totafwait est i comufåt?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
+msgid "Ok"
+msgstr "'l est bon"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, 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:"
+msgid "Cancel"
+msgstr "Rinoncî"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "removing package %s"
-msgstr "dji oistêye li pacaedje %s"
+msgid " (Y/n) "
+msgstr " (O/n) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "«%s»"
+msgid "%s: command not found\n"
+msgstr "%s: comande nén trovêye\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Dji n' sai eployî li môde paralele avou l' môde «use-distrib»"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"po s' è siervi: %s [tchuzes]\n"
+"avou les [tchuzes] prinjhes emey li djivêye chal pa dzo\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "Everything already installed"
-msgstr "tot a ddja stî astalé"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - mostere ci messaedje d' aidance chal.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - netyî l' ridant muchete des tiestires.\n"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [goupe]     - håyner l' etikete di groupe: group.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr ""
+msgid "                    defaults is %s.\n"
+msgstr "                    li prémetou est %s.\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:57
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr ""
-"  --provides     - håyner l' etikete «provides»: tot çou k' est ahessî.\n"
+msgid "unknown protocol defined for %s"
+msgstr "protocole nén cnoxhou defini po %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:79
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "Ké tchoezixhoz vs? (1-%d) "
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "nou aberweteu waibe di trové, les cis sopoirtés sont: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "found %d headers in cache"
-msgstr "%d tiestires trovêyes el muchete"
+msgid "unable to handle protocol: %s"
+msgstr "dji n' sai manaedjî l' protocole: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "i gn a pus d' on pacaedje avou l' minme no d' fitchî rpm «%s»"
+msgid "syntax error in config file at line %s"
+msgstr "aroke di sintacse el fitchî d' apontiaedje al roye %s"
+
+#: ../urpm.pm:174
+#, c-format
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr ""
+"li sopoirt «%s» saye d' eployî on fitchî hdlist dedja eployî, dji passe "
+"houte do sopoirt"
+
+#: ../urpm.pm:180
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr ""
+"li sopoirt «%s» saye d' eployî ene djivêye dedja eployeye, dji passe houte "
+"do sopoirt"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
 msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
 msgstr ""
-"  --proxy-user   - dene l' uzeu eyet l' sicret a-z eployî po\n"
-"                   l' otintifiaedje sol procsi (li cogne est <uzeu:"
-"sicret>).\n"
+"dji n' sai m' ocuper do sopoirt «%s» ca l' fitchî djivêye est ddja eployî pa "
+"èn ôte sopoirt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:202
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "dji fwait l' deujhinme passe po carculer les aloyances\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr ""
+"dji n' pout eployî l' no «%s» pol sopoirt sins no, ca ci no la est ddja "
+"eployî"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "aberwetaedje di fitchî rpm [%s]..."
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr ""
+"dji n' a savou tni conte do sopoirt «%s» ca i gn a nou fitchî di djivêye [%"
+"s] k' egzistêye"
 
-#: ../urpmq:1
+#: ../urpm.pm:213
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - djivêye des alias k' i gn a.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "dji n' sai dire li sopoirt di ci fitchî hdlist chal [%s]"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:222
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...l' aberwetaedje a fwait berwete: %s"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
+msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
-"dji n' sai analijhî li fitchî di djivêye di «%s», dji passe houte do sopoirt"
+"dji n' sai aveur li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpmf:1
+#: ../urpm.pm:249
+#, c-format
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "dji saye di passer houte do sopoirt «%s»"
+
+#: ../urpm.pm:257
 #, c-format
 msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr ""
-"  -o             - operateu binaire OU, vraiy si ene des ratourneures est "
-"vraiye.\n"
+"li forveyou sopoirt «%s» èn doet nén aveur defini di fitchî hdlist ou di "
+"djivêye des fitchîs, dji passe houte do sopoirt"
 
-#: ../urpmi:1
+#: ../urpm.pm:262
 #, c-format
-msgid "Package installation..."
-msgstr "Astalaedje do pacaedje..."
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr ""
+"li forveyou sopoirt «%s» duvreut aveur ene haardpeye valude, dji passe houte "
+"do sopoirt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "no d' fitchî rpm nén valåbe [%s]"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "dji n' sai trover li fitchî hdlist di «%s», dji passe houte do sopoirt"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:278
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "måle declaråcion do procsi sol roye di comande\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr ""
+"dji n' sai trover li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpmi:1
+#: ../urpm.pm:301
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "crombe djivêye di fitchîs po «%s», dji passe houte do sopoirt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:309
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
+msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
-"dji n' a savou trover li prumî sopoirt d' astalaedje (nou fitchî Mandrake/"
-"base/hdlists di trové)"
+"dji n' sai analijhî li fitchî di djivêye di «%s», dji passe houte do sopoirt"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "Choose location to save file"
-msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
+msgid "taking removable device as \"%s\""
+msgstr "dji prind li bodjåve sopoirt come «%s»"
 
-#: ../urpmf:1
+#: ../urpm.pm:347
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - håyner l' etikete di rascourti: summary.\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid "Install it"
-msgstr "L' astaler"
+msgid "unable to write config file [%s]"
+msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - eployî l' eterface X11.\n"
+msgid "write config file [%s]"
+msgstr "dji scrî l' fitchî d' apontiaedje [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "Dji n' sai eployî li môde paralele avou l' môde «use-distrib»"
 
-#: ../urpme:1
+#: ../urpm.pm:412
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "dji n' sai analijhî «%s» e l' fitchî [%s]"
+
+#: ../urpm.pm:423
+#, c-format
+msgid "examining parallel handler in file [%s]"
 msgstr ""
-"Po satisfyî les aloyaedjes, les pacaedjes ki shuvèt vont esse disastalés (%d "
-"Mo)"
 
-#: ../urpmi:1
+#: ../urpm.pm:433
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
+msgid "found parallel handler for nodes: %s"
 msgstr ""
-"  --best-output  - tchoezi li meyeuse eterface (X ou môde tecse), sorlon\n"
-"                   l' evironmint.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "Dj' aberwetêye li pacaedje «%s»..."
+msgid "using associated media for parallel mode: %s"
+msgstr "eployaedje do sopoirt assocyî å môde paralele: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:441
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr ""
-"Çou ki s' pout fé avou les pacaedjes rpm binaires cwand c' est k' on "
-"tchoezixh «--install-src»"
+msgid "unable to use parallel option \"%s\""
+msgstr "dji n' sai eployî l' tchuze «%s» do môde paralele"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"  --auto-select  - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
-"                   do sistinme.\n"
+"--synthesis èn pout nén esse eployî avou --media, --excludemedia, --"
+"sortmedia, --update ou --parallel"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "no package named %s"
-msgstr "nou pacaedje lomé %s"
+msgid "examining synthesis file [%s]"
+msgstr "corwaitaedje do fitchî d' sinteze [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - eployî --all-matches pol roye di comande.\n"
+msgid "examining hdlist file [%s]"
+msgstr "corwaitaedje do fitchî hdlist [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"L' astalaedje a fwait berwete, sacwants fitchîs mankèt:\n"
-"%s\n"
-"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "li forveyou sopoirt «%s» n' est nén locå, dji passe houte do sopoirt"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr ""
-"Po s' è siervi: urpmi.removemedia [-a] <etikete> ...\n"
-"avou <etikete> li no do sopoirt a bodjî.\n"
+"åk n' a nén stî tot léjhant li fitchî hdlist ou di sinteze do sopoirt «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr ""
-"L' astalaedje ni s' pout porshure, ce les pacaedjes shuvants\n"
-"ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
-"%s\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "dji fwait l' deujhinme passe po carculer les aloyances\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:563
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "«with» manke pol sopoirt rantoele\n"
+msgid "skipping package %s"
+msgstr "dji passe houte do pacaedje %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:572
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - djivêye des pacaedjes k' i gn a.\n"
+msgid "would install instead of upgrade package %s"
+msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
 
-#: ../urpme:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "unknown package"
-msgstr "pacaedje nén cnoxhou"
+msgid "unable to open rpmdb"
+msgstr "dji n' sai drovi l' båze rpmdb"
 
-#: ../urpmi:1
+#: ../urpm.pm:622
 #, c-format
-msgid "Installation is possible"
-msgstr "L' astalaedje est possibe"
+msgid "medium \"%s\" already exists"
+msgstr "li sopoirt «%s» egzistêye dedja"
 
-#: ../urpmi:1
+#: ../urpm.pm:629
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Les pacaedjes shuvants ont mezåjhe d' esse oistés po des ôtes esse metous a "
-"djoû:\n"
-"%s"
+msgid "virtual medium need to be local"
+msgstr "les forveyous sopoirts divèt esse locås"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr ""
-"Po satisfyî les aloyaedjes, les %d pacaedjes shuvants vont esse astalés (%d "
-"Mo)"
+msgid "added medium %s"
+msgstr "sopoirt %s radjouté"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:677
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr ""
-"dji n' a savou tni conte do sopoirt «%s» ca i gn a nou fitchî di djivêye [%"
-"s] k' egzistêye"
+msgid "unable to access first installation medium"
+msgstr "dji n' a savou trover li prumî sopoirt d' astalaedje"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:681
 #, c-format
-msgid " (y/N) "
-msgstr " (o/N) "
+msgid "copying hdlists file..."
+msgstr "copiaedje do fitchî hdlist..."
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "dji n' pou radjouter des metaedjes a djoû d' ene distribucion cooker\n"
+msgid "...copying failed"
+msgstr "...li copiaedje a fwait berwete"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - môde badjawe.\n"
+msgid "...copying done"
+msgstr "...li copiaedje a stî comufåt"
 
-#: ../urpmi:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
-msgid "Initializing..."
-msgstr "Inicialijhaedje..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr ""
+"dji n' a savou trover li prumî sopoirt d' astalaedje (nou fitchî Mandrake/"
+"base/hdlists di trové)"
 
-#: ../urpmq:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - djivêye des pacaedjes k' i gn a.\n"
+msgid "retrieving hdlists file..."
+msgstr "aberwetaedje do fitchî hdlist..."
 
-#: ../urpmf:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - håyner totes les etiketes.\n"
+msgid "...retrieving done"
+msgstr "...l' aberwetaedje a stî comufåt"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vormint"
+msgid "...retrieving failed: %s"
+msgstr "...l' aberwetaedje a fwait berwete: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"li forveyou sopoirt «%s» èn doet nén aveur defini di fitchî hdlist ou di "
-"djivêye des fitchîs, dji passe houte do sopoirt"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "discrijhaedje hdlist nén valide «%s» el fitchî hdlists"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "carculaedje do fitchî «hdlist» (ou del sinteze) ki vént d' esse copyî"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - tchimins separés pa des comas, a n' nén foyter.\n"
+msgid "selecting multiple media: %s"
+msgstr "dji tchoezixh des sopoirts multipes: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "Tapez so «enter» cwand c' est fwait..."
+msgid "\"%s\""
+msgstr "«%s»"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:783
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"tchuzes nén cnoxhowes «%s»\n"
+msgid "removing medium \"%s\""
+msgstr "dji bodje li sopoirt «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
+"dji n' sai acceder å sopoirt «%s»,\n"
+"çoula pout arriver metans si vos avoz monté al mwin li ridant divant di "
+"radjouter l' sopoirt d' astalaedje."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
 msgstr ""
-"åk n' a nén stî tot léjhant li fitchî hdlist ou di sinteze do sopoirt «%s»"
+"li forveyou sopoirt «%s» duvreut aveur on fitchî sourdant hdlist ou di "
+"sinteze valides, dji passe houte do sopoirt"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - eployî wget po-z aberweter les fitchî då lon.\n"
+msgid "copying description file of \"%s\"..."
+msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr ""
-"  -p             - fé des rcweraedjes ezès aloyances po trover on pacaedje.\n"
-
-#: ../urpmq:1
-#, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - djivêye des nuks k' i gn a (eployant --parallel).\n"
+"carculaedje do md5sum do fitchî «hdlist» (ou del sinteze) k' egzistêye dedja"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "dji fwai l' fitchî hdlist [%s]"
+msgid "examining MD5SUM file"
+msgstr "corwaitaedje do fitchî MD5SUM"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - wårder les pacaedjes k' i gn a si c' est possibe,\n"
-"                   rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "copiaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "corwaitaedje do fitchî MD5SUM"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "copy of [%s] failed (li fitchî est pår pitit ki s' end est bizåre)"
 
-#: ../_irpm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: comande nén trovêye\n"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "carculaedje do fitchî «hdlist» (ou del sinteze) ki vént d' esse copyî"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "unable to register rpm file"
-msgstr "dji n' sai redjîstrer l' fitchî rpm"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - permete k' on dimande a l' uzeu s' i vout astaler\n"
-"                   les pacaedjes sins verifyî les aloyances.\n"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "åk n' a nén stî tot lejhant li fitchî di sinteze do sopoirt «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "dji n' sai manaedjî l' protocole: %s"
+msgid "reading rpm files from [%s]"
+msgstr "lejhant les fitchîs rpm foû di [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "aberwetaedje do fitchî hdlist..."
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "dji n' sai lere les fitchîs rpm foû di [%s]: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "Yes, really install it"
-msgstr "Oyi, djel vout astaler"
+msgid "no rpm files found from [%s]"
+msgstr "nou fitchî rpm di trové foû di [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "added medium %s"
-msgstr "sopoirt %s radjouté"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - wårder el muchete les pacaedjes rpm nén eployîs.\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr ""
-"ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
-"djoû=%d)"
+"dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
+"aberweté"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
 msgid "md5sum mismatch"
 msgstr "li md5sum ni corespond nén"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr "aroke di sintacse el fitchî d' apontiaedje al roye %s"
-
-#: ../urpmi:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  les nos ou fitchîs rpm dinés sol roye di cmande seront-st astalés.\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "l' aberwetaedje do sourdant «hdlist» (ou del sinteze) a fwait berwete"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1490
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - eployî li proxy HTTP dné, li prémetou pôrt si nén dné\n"
-"                   est 1080 (li cogne pol tchuze est <lodjoeprocsi[:pôrt]"
-">).\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "in order to install %s"
-msgstr "po-z astaler %s"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "li fitchî [%s] est ddja eployî dins l' minme sopoirt «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr ""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "dji n' sai analijhî li fitchî hdlist di «%s»"
 
-#: ../urpmf:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
+msgid "unable to write list file of \"%s\""
+msgstr "dji n' sai scrire li fitchî djivêye di «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:1586
 #, 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"
+msgid "writing list file for medium \"%s\""
+msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
+msgid "nothing written in list file for \"%s\""
+msgstr "rén n' a stî scrît el fitchî djivêye po «%s»"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "aberwetaedje des muroes di %s..."
+msgid "examining pubkey file of \"%s\"..."
+msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr ""
-"  --url          - håyner l' etikete «url»: hårdêye avou des informåcions.\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "protocole nén cnoxhou defini po %s"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "dji n' sai aberweter li clé publike da «%s»"
 
-#: ../urpmq:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - mostere li no, limeros di modêye eyet release.\n"
+msgid "reading headers from medium \"%s\""
+msgstr "dji lét les tiestires do sopoirt «%s»"
 
-#: ../urpmf:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes    - håyner l' etikete «obsoletes»: tos les vîs cayets.\n"
+msgid "building hdlist [%s]"
+msgstr "dji fwai l' fitchî hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "li sopoirt «%s» egzistêye dedja"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "dji fwai li fitchî di sinteze hdlist pol sopoirt «%s»"
 
-#: ../_irpm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "installing %s\n"
-msgstr "dj' astale %s\n"
+msgid "found %d headers in cache"
+msgstr "%d tiestires trovêyes el muchete"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1749
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"i gn a pont d' intrêye a mete a djoû\n"
-"(ene di %s)\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "dji bodje %d viyès tiestires del muchete"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "trying to promote %s"
-msgstr ""
+msgid "mounting %s"
+msgstr "dji monte %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "unable to remove package %s"
-msgstr "dji n' sai oister l' pacaedje %s"
+msgid "unmounting %s"
+msgstr "dji dismonte %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "åk n' a nén stî tot lejhant li fitchî di sinteze do sopoirt «%s»"
+msgid "relocated %s entries in depslist"
+msgstr ""
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1929
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
+msgid "no entries relocated in depslist"
 msgstr ""
-"i gn a pont d' intrêye a bodjî\n"
-"(ene di %s)\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - tchoezi tos les sopoirts.\n"
+msgid "invalid rpm file name [%s]"
+msgstr "no d' fitchî rpm nén valåbe [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "I manke li sinateure (%s)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "aberwetaedje di fitchî rpm [%s]..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "dji n' sai lere les fitchîs rpm foû di [%s]: %s"
+msgid "unable to access rpm file [%s]"
+msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-" --parallel     - distribouwaedje di l' ovraedje d' urpmi so\n"
-"                  so sacwantès éndjoles defineyes come alias.\n"
+msgid "unable to register rpm file"
+msgstr "dji n' sai redjîstrer l' fitchî rpm"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "copy of [%s] failed (li fitchî est pår pitit ki s' end est bizåre)"
+msgid "error registering local packages"
+msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - mete a djoû rén kel sopoirt di metaedje a djoû.\n"
+msgid "no package named %s"
+msgstr "nou pacaedje lomé %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid " (Y/n) "
-msgstr " (O/n) "
+msgid "The following packages contain %s: %s"
+msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [goupe]     - håyner l' etikete di groupe: group.\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "i gn a pus d' on pacaedje avou l' minme no d' fitchî rpm «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"li sopoirt «%s» saye d' eployî ene djivêye dedja eployeye, dji passe houte "
-"do sopoirt"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "dji n' sai analijhî comufåt [%s] pol valixhance «%s»"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "crombe intrêye: [%s]"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"li sopoirt «%s» eploye ene crombe djivêye di fitchîs:\n"
+"  probåblumint ki l' muroe n' est nén a djoû, dji saye ene ôte metôde"
 
-#: ../urpme:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "oister li pacaedje %s va spiyî vosse sistinme"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "li sopoirt «%s» èn definixh nou eplaeçmint po les fitchîs rpm"
 
-#: ../urpmq:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - djivêye des sopoirts k' i gn a.\n"
+msgid "package %s is not found."
+msgstr "li pacaedje %s n' a nén stî trové."
 
-#: ../urpmi:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
-"%s"
+msgid "urpmi database locked"
+msgstr "båze di dnêyes urpmi serêye"
 
-#: ../urpmi:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
+msgid "medium \"%s\" is not selected"
+msgstr "li sopoirt «%s» n' a nén stî tchoezi"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr ""
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
 
-#: ../urpmi:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - astaler seulmint pacaedjes sourdant (nén les binaires).\n"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vormint"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - eployî curl po-z aberweter les fitchî då lon.\n"
+msgid "unable to access medium \"%s\""
+msgstr "dji n' sai aveur accès å sopoirt «%s»"
 
-#: ../urpmf:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-"  -e             - sititchî do côde perl directumint, come «perl -e».\n"
+msgid "malformed input: [%s]"
+msgstr "crombe intrêye: [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "do you agree ?"
-msgstr "estoz vs d' acoird?"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "crombe djivêye di fitchîs po «%s», dji passe houte do sopoirt"
+msgid "Preparing..."
+msgstr "Dj' aprustêye..."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "...retrieving done"
-msgstr "...l' aberwetaedje a stî comufåt"
+msgid "using process %d for executing transaction"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
-"dji radjoute li pacaedje %s (id=%d, eid=%d, metaedje a djoû=%d, fitchîs=%s)"
+"ahivé ene transaccion po l' astalaedje so %s (oister=%d, astaler=%d, mete a "
+"djoû=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "skipping package %s"
-msgstr "dji passe houte do pacaedje %s"
+msgid "unable to create transaction"
+msgstr "dji n' sai ahiver ene transaccion"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "Sinateure nén valide (%s)"
+msgid "removing package %s"
+msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:2796
 #, c-format
-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"
+msgid "unable to remove package %s"
+msgstr "dji n' sai oister l' pacaedje %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2806
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr ""
-"urpmi modêye %s\n"
-"Copyright © 1999, 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"
+"dji radjoute li pacaedje %s (id=%d, eid=%d, metaedje a djoû=%d, fitchîs=%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "dji n' sai analijhî comufåt [%s] pol valixhance «%s»"
+msgid "unable to install package %s"
+msgstr "dji n' sai astaler l' pacaedje %s"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
+msgid "due to missing %s"
+msgstr "cåze di %s ki n' est nén la"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "dji n' sai dire li sopoirt di ci fitchî hdlist chal [%s]"
+msgid "due to unsatisfied %s"
+msgstr "cåze di %s ki n' est nén satisfyî"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "dji n' sai analijhî li fitchî hdlist di «%s»"
+msgid "trying to promote %s"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"li sopoirt «%s» saye d' eployî on fitchî hdlist dedja eployî, dji passe "
-"houte do sopoirt"
+msgid "in order to keep %s"
+msgstr "po wårder %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3035
+#, c-format
+msgid "in order to install %s"
+msgstr "po-z astaler %s"
+
+#: ../urpm.pm:3047
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "cåze di conflits avou %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "dji bodje %d viyès tiestires del muchete"
+msgid "unrequested"
+msgstr "nén dmandé"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3065
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
+msgid "Invalid signature (%s)"
+msgstr "Sinateure nén valide (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
+msgid "Invalid Key ID (%s)"
+msgstr "ID di clé nén valide (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "li forveyou sopoirt «%s» n' est nén locå, dji passe houte do sopoirt"
+msgid "Missing signature (%s)"
+msgstr "I manke li sinateure (%s)"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "Preparing..."
-msgstr "Dj' aprustêye..."
+msgid "bad proxy declaration on command line\n"
+msgstr "måle declaråcion do procsi sol roye di comande\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    li prémetou est %s.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
+msgid "Sorry, bad choice, try again\n"
+msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:36
 #, c-format
 msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr ""
-"  --no-probe     - èn nén sayî di trover on fitchî di sinteze\n"
-"                   ou «hdlist».\n"
-
-#: ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  -P             - do not search in provides to find package.\n"
+"urpme version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
-"  -P             - èn nén fé des rcweraedjes ezès aloyances po trover\n"
-"                   on pacaedje.\n"
+"urpmi modêye %s\n"
+"Copyright © 1999, 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"
 
-#: ../urpm.pm:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
 
-#: ../urpmq:1
+#: ../urpme:42 ../urpmi:83
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
+"  --auto         - tchoezi otomaticmint on pacaedje divins les tchuzes.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr ""
-"po s' è siervi: %s [tchuzes]\n"
-"avou les [tchuzes] prinjhes emey li djivêye chal pa dzo\n"
+"  --test         - verifyî si l' astalaedje si pout fé comufåt disk' al "
+"fén.\n"
 
-#: ../urpmi:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
-"  --clean        - oister del muchete les pacaedjes rpm divant d' ataker.\n"
+"  --force        - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
+"nén.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
-"dji n' pout eployî l' no «%s» pol sopoirt sins no, ca ci no la est ddja "
-"eployî"
+" --parallel     - distribouwaedje di l' ovraedje d' urpmi so\n"
+"                  so sacwantès éndjoles defineyes come alias.\n"
 
-#: ../urpmf:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - håyner l' etikete «conflicts»: tos les conflits.\n"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - eployî ene ôte raecene po l' astalaedje des rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"li forveyou sopoirt «%s» duvreut aveur on fitchî sourdant hdlist ou di "
-"sinteze valides, dji passe houte do sopoirt"
 
-#: ../urpme:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi modêye %s\n"
-"Copyright © 1999, 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"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - môde badjawe.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:50
 #, c-format
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
-"po s' è siervi: urpmi.addmedia [tchuzes] <etikete> <hårdêye> [with "
-"<tchimin_relatif>]\n"
-"li <hårdêye> pout esse ene etur:\n"
-"       file://<tchimin>\n"
-"       ftp://<login>:<sicret>@<lodjoe>/<tchimin> with <tchimin relatif pol "
-"fitchî hdlist>\n"
-"       ftp://<lodjoe>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
-"       http://<lodjoe>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
-"       removable://<tchimin>\n"
-"\n"
-"et les [tchuzes] possibes sont\n"
+"  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "copiaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
+msgid "unknown packages"
+msgstr "pacaedjes nén cnoxhous"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "...copying done"
-msgstr "...li copiaedje a stî comufåt"
+msgid "unknown package"
+msgstr "pacaedje nén cnoxhou"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "dji n' sai eployî l' tchuze «%s» do môde paralele"
+msgid "removing package %s will break your system"
+msgstr "oister li pacaedje %s va spiyî vosse sistinme"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"li sopoirt «%s» eploye ene crombe djivêye di fitchîs:\n"
-"  probåblumint ki l' muroe n' est nén a djoû, dji saye ene ôte metôde"
+msgid "Nothing to remove"
+msgstr "Rén a oister"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "dji n' a savou trover li prumî sopoirt d' astalaedje"
+msgid "Checking to remove the following packages"
+msgstr "Verifiaedje po oister les pacaedjes ki shuvèt"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "les forveyous sopoirts divèt esse locås"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr ""
+"Po satisfyî les aloyaedjes, les pacaedjes ki shuvèt vont esse disastalés (%d "
+"Mo)"
 
-#: ../urpm.pm:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "error registering local packages"
-msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
+msgid " (y/N) "
+msgstr " (o/N) "
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - limiter li roedeu di l' aberwetaedje.\n"
+msgid "removing %s"
+msgstr "dji oistêye li pacaedje %s"
 
-#: ../urpm.pm:1
+#: ../urpme:115
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
+msgid "Removing failed"
+msgstr "Li oistaedje a fwait berwete"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "l' aberwetaedje do sourdant «hdlist» (ou del sinteze) a fwait berwete"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf modêye %s\n"
+"Copyright © 2002-2004 MandrakeSoft.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s' è siervi:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "nou fitchî rpm di trové foû di [%s]"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "rén n' a stî scrît el fitchî djivêye po «%s»"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr ""
+"  --media        - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
 
-#: ../urpmi:1
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr ""
+"  --excludemedia - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"carculaedje do md5sum do fitchî «hdlist» (ou del sinteze) k' egzistêye dedja"
+"  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
+"separêyes pa des comas.\n"
 
-#: ../urpmq:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - rexhowe en etir avou l' pacaedjes a oister.\n"
+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"
 
-#: ../urpm.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "unable to install package %s"
-msgstr "dji n' sai astaler l' pacaedje %s"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - môde badjawe.\n"
 
-#: ../urpmi:1
+#: ../urpmf:39
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
 msgstr ""
-"  --allow-force  - permete k' on dimande a l' uzeu s' i vout astaler\n"
-"                   les pacaedjes sins verifyî les aloyances nerén\n"
-"                   l' etegrité.\n"
+"  --quiet         - èn nén håyner l' no des etiketes (prémetou si nole\n"
+"                    etikete dinêye sol roye di cmande, nén interactif).\n"
 
-#: ../urpmi:1
+#: ../urpmf:41
 #, c-format
-msgid "Save file"
-msgstr "Schaper l' fitchî"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq         - èn nén håyner les royes ki sont les minmes.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: dji n' sai lere li fitchî rpm «%s»\n"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - håyner totes les etiketes.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - håyner l' etikete di groupe: group.\n"
 
-#: ../urpme:1
+#: ../urpmf:44
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size         - håyner l' etikete del grandeu: size.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID di clé nén valide (%s)"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch        - håyner l' etikete del epoke: epoch.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:46
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
-"nén.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary      - håyner l' etikete di rascourti: summary.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:47
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description  - håyner l' etikete di discrijhaedje: description.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 msgstr ""
-"  --probe-synthesis - sayî di trover ey eployî les fitchîs di sinteze.\n"
+"  --sourcerpm    - håyner l' etikete «sourcerpm»: no do fitchî src.rpm "
+"sourdant.\n"
 
-#: ../urpmi:1
+#: ../urpmf:49
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --packager     - print tag packager: packager.\n"
 msgstr ""
-"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
-"                   båze di dnêyes d' urpmi.\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - foircî l' metaedje a djoû del clé gpg.\n"
+"  --packager     - håyner l' etikete «packager»: li ci k' a fwait "
+"l' pacaedje.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:50
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "i manke li tchmin relatif pol fitchî hdlist\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr ""
+"  --buildhost    - håyner l' etikete «buildhost»: lodjoe wice ki l' pacaedje "
+"a stî fwait.\n"
 
-#: ../urpme:1
+#: ../urpmf:51
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "Verifiaedje po oister les pacaedjes ki shuvèt"
+msgid "  --url          - print tag url: url.\n"
+msgstr ""
+"  --url          - håyner l' etikete «url»: hårdêye avou des informåcions.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:52
 #, c-format
-msgid "unrequested"
-msgstr "nén dmandé"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr ""
+"  --provides     - håyner l' etikete «provides»: tot çou k' est ahessî.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr ""
+"  --requires     - håyner l' etikete «requires»: tot çou k' i gn a mezåjhe.\n"
 
-#: ../urpmf:1
+#: ../urpmf:54
 #, c-format
 msgid "  --files        - print tag files: all files.\n"
 msgstr "  --files        - håyner l' etikete «files»: tos les fitchîs.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "dji n' sai analijhî «%s» e l' fitchî [%s]"
-
-#: ../urpmi:1
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Voloz vs continuwer avou l' astalaedje?"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts    - håyner l' etikete «conflicts»: tos les conflits.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "dji n' sai lere li fitchî rpm [%s] foû do sopoirt «%s»"
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr ""
+"  --obsoletes    - håyner l' etikete «obsoletes»: tos les vîs cayets.\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
 msgstr ""
+"  --env          - eployî on evironmint dné (tipike po les rapoirts\n"
+"                   di bug).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "dji fwai li fitchî di sinteze hdlist pol sopoirt «%s»"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
-"  -i             - håyner des ahessåvès informåcions, dins ene cogne po les "
-"djins.\n"
+"  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
+"l' no.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
-"  --version      - eployî li dnêye modêye del distribucion, li prémetowe\n"
-"                   valixhance est l' cene do pacaedje «mandrake-release»\n"
-"                   d' astalé.\n"
+"  -e             - sititchî do côde perl directumint, come «perl -e».\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr ""
-"  --from         - eployî li dnêye hårdêye pol djivêye des muroes,\n"
-"                   li prémetowe hårdêye est %s\n"
+"  -a             - operateu binaire EYET, vraiy si les deus ratourneures "
+"sont vraiyes.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
+"  -o             - operateu binaire OU, vraiy si ene des ratourneures est "
+"vraiye.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr ""
 "  !              - operateu unaire NENI, vraiy si l' ratourneure est fåsse.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
+msgid "  (              - left parenthesis to open group expression.\n"
 msgstr ""
-"Li ridant [%s] egzistêye dedja, eployîz è èn ôte po les rapoirts di bugs, "
-"oudonbén disfacez l'."
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unmounting %s"
-msgstr "dji dismonte %s"
+"  (              - åtchete di hintche po drovi on groupe di ratourneures.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:66
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr ""
+"  )              - åtchete di droete po clôre on groupe di ratourneures.\n"
 
-#: ../urpmi:1
+#: ../urpmf:114
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% di fwait, roedeu = %s"
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "restarting urpmi"
-msgstr "renondand urpmi"
+msgid "using specific environment on %s\n"
+msgstr "eployant on evironmint specifike so %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:150
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "corwaitaedje do fitchî d' sinteze [%s]"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi modêye %s\n"
+"Copyright © 1999, 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"
 
-#: ../urpm.pm:1
+#: ../urpmi:82
 #, c-format
-msgid "...copying failed"
-msgstr "...li copiaedje a fwait berwete"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
+"                   båze di dnêyes d' urpmi.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe houte do sopoirt"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
+"                   do sistinme.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - môde taijheu.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - måy dimander po dizastaler on pacaedje, purade rinoncî.\n"
 
-#: ../urpmf:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - môde badjawe.\n"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - wårder les pacaedjes k' i gn a si c' est possibe,\n"
+"                   rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
 
-#: ../urpmq:1
+#: ../urpmi:88
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --sources      - diner tos les pacaedjes sourdant divant d' aberweter\n"
-"                   (èn pout esse fwait ki pa root).\n"
 
-#: ../urpmq:1
+#: ../urpmi:91
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr ""
-"  --headers      - saetchî les tiestires pol diné pacaedje a pårti del\n"
-"                   båze di dnêyes urpmi, et les håyner sol rexhowe\n"
-"                   sitandård (stdout) -- èn pout esse fwait ki pa root.\n"
 
-#: ../urpme:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "unknown packages"
-msgstr "pacaedjes nén cnoxhous"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - foirci des cweraedjes rishonnants (come -y).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "dji tchoezixh des sopoirts multipes: %s"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr ""
+"  --src          - li pacaedje shuvant est on pacaedje sourdant\n"
+"                   (parey ki -s).\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
-"l' no.\n"
+"  --install-src  - astaler seulmint pacaedjes sourdant (nén les binaires).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:95
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "li fitchî [%s] est ddja eployî dins l' minme sopoirt «%s»"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr ""
+"  --clean        - oister del muchete les pacaedjes rpm divant d' ataker.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:96
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "rén a disastaler (eployîz urpmi.addmedia po-z adjouter on sopoirt\n"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - wårder el muchete les pacaedjes rpm nén eployîs.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:98
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"dji n' sai trover li fitchî di djivêye di «%s», dji passe houte do sopoirt"
+"  --allow-nodeps - permete k' on dimande a l' uzeu s' i vout astaler\n"
+"                   les pacaedjes sins verifyî les aloyances.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:100
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - mostere ci messaedje d' aidance chal.\n"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - permete k' on dimande a l' uzeu s' i vout astaler\n"
+"                   les pacaedjes sins verifyî les aloyances nerén\n"
+"                   l' etegrité.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:104
 #, c-format
-msgid "found parallel handler for nodes: %s"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
+#, c-format
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - eployî wget po-z aberweter les fitchî då lon.\n"
+
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
+#, c-format
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - eployî curl po-z aberweter les fitchî då lon.\n"
+
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#, c-format
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - limiter li roedeu di l' aberwetaedje.\n"
+
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
+"  --resume       - rataker l' aberwetaedje des fitchîs rpm la wice k' il "
+"ont\n"
+"                   stî djokés (--no-resume po nel nén fé, prémetou=nén fé).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  -R             - fé l' ricweraedje å rvier, so çou k' a mezåjhe do "
-"pacaedje.\n"
+"  --proxy        - eployî li proxy HTTP dné, li prémetou pôrt si nén dné\n"
+"                   est 1080 (li cogne pol tchuze est <lodjoeprocsi[:pôrt]"
+">).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf modêye %s\n"
-"Copyright © 2002 MandrakeSoft.\n"
-"Çouci est on libe programe et pout esse cossemé so les termes del licince "
-"GPL.\n"
-"\n"
-"Po s' è siervi:\n"
+"  --proxy-user   - dene l' uzeu eyet l' sicret a-z eployî po\n"
+"                   l' otintifiaedje sol procsi (li cogne est <uzeu:"
+"sicret>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - èn nén håyner l' no des etiketes (prémetou si nole\n"
-"                    etikete dinêye sol roye di cmande, nén interactif).\n"
+"  --bug          - sicrire on rapoirt di bug dins l' ridant dné come\n"
+"                   årgumint djusse après.\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq         - èn nén håyner les royes ki sont les minmes.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - eployî l' eterface X11.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis èn pout nén esse eployî avou --media, --excludemedia, --"
-"sortmedia, --update ou --parallel"
+"  --best-output  - tchoezi li meyeuse eterface (X ou môde tecse), sorlon\n"
+"                   l' evironmint.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - eployî li dnêye årtchitecteure, li prémetowe valixhance\n"
-"                   est l' cene do pacaedje «mandrake-release» d' astalé.\n"
+"  --verify-rpm   - verifyî li sinateure rpm divant d' astaler.\n"
+"                   (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "Totafwait est i comufåt?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - tchimins separés pa des comas, a n' nén foyter.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - èn nén astaler les fitchîs d' documintåcion.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - eployî --all-matches pol roye di comande.\n"
+
+#: ../urpmi:128
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
 msgstr ""
-"  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
-"                   båze di dnêyes d' urpmi.\n"
+"  -p             - fé des rcweraedjes ezès aloyances po trover on pacaedje.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "examining parallel handler in file [%s]"
+msgid "  -P             - do not search in provides to find package.\n"
 msgstr ""
+"  -P             - èn nén fé des rcweraedjes ezès aloyances po trover\n"
+"                   on pacaedje.\n"
 
-#: ../urpme:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "Nothing to remove"
-msgstr "Rén a oister"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - foirci des cweraedjes rishonnants (come --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr ""
+"  -s             - li pacaedje shuvant est on pacaedje sourdant\n"
+"                   (parey ki --src).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:132
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "dji lét les tiestires do sopoirt «%s»"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - môde taijheu.\n"
 
-#: ../urpmq:1
+#: ../urpmi:134
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  les nos ou fitchîs rpm dinés sol roye di cmande seront-st astalés.\n"
+
+#: ../urpmi:141
+#, c-format
+msgid "Choose location to save file"
+msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
+
+#: ../urpmi:197
+#, c-format
+msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
-"  -d             - sitinde li cweraedje åzès aloyances des pacaedjes.\n"
+"Çou ki s' pout fé avou les pacaedjes rpm binaires cwand c' est k' on "
+"tchoezixh «--install-src»"
 
-#: ../urpmi:1
+#: ../urpmi:204
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"  --bug          - sicrire on rapoirt di bug dins l' ridant dné come\n"
-"                   årgumint djusse après.\n"
+"Vos avoz tchoezi on pacaedje côde sourdant:\n"
+"\n"
+"%s\n"
+"\n"
+"Probåblumint vos n' volîz nén l' astaler so vosse copiutrece (l' astaler\n"
+"vos permete di fé des candjmints å côde sourdant eyet del ricopiler).\n"
+"\n"
+"Cwè voloz vs fé?"
 
-#: ../urpm.pm:1
+#: ../urpmi:212
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "li sopoirt «%s» èn definixh nou eplaeçmint po les fitchîs rpm"
+msgid "Do nothing"
+msgstr "Èn rén fé"
 
-#: ../urpmf:1
+#: ../urpmi:213
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr ""
-"  --sourcerpm    - håyner l' etikete «sourcerpm»: no do fitchî src.rpm "
-"sourdant.\n"
+msgid "Yes, really install it"
+msgstr "Oyi, djel vout astaler"
 
-#: ../urpm.pm:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "dji n' sai scrire li fitchî djivêye di «%s»"
+msgid "Save file"
+msgstr "Schaper l' fitchî"
 
-#: ../urpmf:1
+#: ../urpmi:225
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"  --requires     - håyner l' etikete «requires»: tot çou k' i gn a mezåjhe.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
+"Vos alez astaler li pacaedje shuvant so vosse copiutrece:\n"
+"\n"
+"%s\n"
+"\n"
+"Motoit vos vloz djusse li schaper. Cwè tchoezixhoz vs?"
 
-#: ../urpmf:1
+#: ../urpmi:230
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description  - håyner l' etikete di discrijhaedje: description.\n"
+msgid "Install it"
+msgstr "L' astaler"
 
-#: ../urpmi:1
+#: ../urpmi:239
 #, c-format
-msgid "Copying failed"
-msgstr "Li copiaedje a fwait berwete"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Li ridant [%s] egzistêye dedja, eployîz è èn ôte po les rapoirts di bugs, "
+"oudonbén disfacez l'."
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:240
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "dji n' sai askepyî l' ridant [%s] po fé des rapoirts di bug"
 
-#: ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
+msgid "Copying failed"
+msgstr "Li copiaedje a fwait berwete"
 
-#: ../urpm.pm:1
+#: ../urpmi:260
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
+msgid "Only superuser is allowed to install packages"
+msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:396
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  -s             - li pacaedje shuvant est on pacaedje sourdant\n"
-"                   (parey ki --src).\n"
+msgid "One of the following packages is needed:"
+msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../urpmi:1
+#: ../urpmi:403
 #, c-format
-msgid "installing %s"
-msgstr "dj' astale %s"
+msgid "What is your choice? (1-%d) "
+msgstr "Ké tchoezixhoz vs? (1-%d) "
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "lejhant les fitchîs rpm foû di [%s]"
+msgid "Package installation..."
+msgstr "Astalaedje do pacaedje..."
 
-#: ../urpm.pm:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
+msgid "Initializing..."
+msgstr "Inicialijhaedje..."
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:435
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
-"  --auto         - tchoezi otomaticmint on pacaedje divins les tchuzes.\n"
+"Sacwants pacaedjes dimandés n' polèt nén esse astalés:\n"
+"%s"
 
-#: ../urpme:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "Removing failed"
-msgstr "Li oistaedje a fwait berwete"
+msgid "do you agree ?"
+msgstr "estoz vs d' acoird?"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:455
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
 msgstr ""
-"  --virtual      - ahiver on forveyou sopoirt ki sont tofer a djoû,\n"
-"                   rén ki l' protocole «file://» est permetou.\n"
+"L' astalaedje ni s' pout porshure, ce les pacaedjes shuvants\n"
+"ont mezåjhe d' esse oistés po des ôtes esse metous a djoû:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:461
 #, c-format
-msgid "package %s is not found."
-msgstr "li pacaedje %s n' a nén stî trové."
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Les pacaedjes shuvants ont mezåjhe d' esse oistés po des ôtes esse metous a "
+"djoû:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "dji bodje li sopoirt «%s»"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr ""
+"Po satisfyî les aloyaedjes, les %d pacaedjes shuvants vont esse astalés (%d "
+"Mo)"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:505
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
 msgstr ""
-"nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
+"Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
+"%s\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "Cancel"
-msgstr "Rinoncî"
+msgid "unable to get source packages, aborting"
+msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - li pacaedje shuvant est on pacaedje sourdant\n"
-"                   (parey ki -s).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr ""
-"  --env          - eployî on evironmint dné (tipike po les rapoirts\n"
-"                   di bug).\n"
+msgid "Press Enter when ready..."
+msgstr "Tapez so «enter» cwand c' est fwait..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:585
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
-"separêyes pa des comas.\n"
+msgid "Downloading package `%s'..."
+msgstr "Dj' aberwetêye li pacaedje «%s»..."
 
-#: ../urpm.pm:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "dji n' sai aveur accès å sopoirt «%s»"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% di %s di fwait, ETA = %s, roedeu = %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:600
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% di fwait, roedeu = %s"
 
-#: ../urpmf:1
+#: ../urpmi:619
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr ""
-"  --packager     - håyner l' etikete «packager»: li ci k' a fwait "
-"l' pacaedje.\n"
+msgid "The following packages have bad signatures"
+msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
 
-#: ../urpmq:1
+#: ../urpmi:620
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - copiaedje di l' apontiaedje dizo cogne d' èn årgumint po "
-"urpmi.addmedia.\n"
+msgid "Do you want to continue installation ?"
+msgstr "Voloz vs continuwer avou l' astalaedje?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
+"L' astalaedje a fwait berwete, sacwants fitchîs mankèt:\n"
 "%s\n"
+"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - håyner li djournå des candjmints.\n"
+msgid "Installation failed"
+msgstr "L' astalåcion a fwait berwete"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr ""
-"dji n' sai aveur li fitchî di djivêye di «%s», dji passe houte do sopoirt"
+msgid "distributing %s"
+msgstr "dji distribouwe %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr ""
-"  )              - åtchete di droete po clôre on groupe di ratourneures.\n"
+msgid "installing %s"
+msgstr "dj' astale %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "nou aberweteu waibe di trové, les cis sopoirtés sont: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "corwaitaedje do fitchî hdlist [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "copiaedje do fitchî hdlist..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
+msgid "%d installation transactions failed"
+msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr ""
-"li forveyou sopoirt «%s» duvreut aveur ene haardpeye valude, dji passe houte "
-"do sopoirt"
+msgid "Installation is possible"
+msgstr "L' astalaedje est possibe"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr ""
-"  --buildhost    - håyner l' etikete «buildhost»: lodjoe wice ki l' pacaedje "
-"a stî fwait.\n"
+msgid "Everything already installed"
+msgstr "tot a ddja stî astalé"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "Èn rén fé"
+msgid "restarting urpmi"
+msgstr "renondand urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "eployaedje do sopoirt assocyî å môde paralele: %s"
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"po s' è siervi: urpmi.addmedia [tchuzes] <etikete> <hårdêye> [with "
+"<tchimin_relatif>]\n"
+"li <hårdêye> pout esse ene etur:\n"
+"       file://<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
+"       ftp://<login>:<sicret>@<lodjoe>/<tchimin> with <tchimin relatif pol "
+"fitchî hdlist>\n"
+"       ftp://<lodjoe>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
+"       http://<lodjoe>/<tchimin> with <tchimin relatif pol fitchî hdlist>\n"
+"       removable://<tchimin>\n"
+"\n"
+"et les [tchuzes] possibes sont\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "dji monte %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - fé on sopoirt di metaedje a djoû.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr ""
-"dji n' sai m' ocuper do sopoirt «%s» ca l' fitchî djivêye est ddja eployî pa "
-"èn ôte sopoirt"
+"  --probe-synthesis - sayî di trover ey eployî les fitchîs di sinteze.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - sayî di trover ey eployî fitchî «hdlist».\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - eployî ene ôte raecene po l' astalaedje des rpm.\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr ""
+"  --no-probe     - èn nén sayî di trover on fitchî di sinteze\n"
+"                   ou «hdlist».\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% di %s di fwait, ETA = %s, roedeu = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr ""
+"  --distrib      - fé otomaticmint tos les sopoirts a pårti d' on sopoirt\n"
+"                   d' astalåcion.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
 msgstr ""
-"dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
-"aberweté"
+"   --distrib-XXX  - fé otomaticmint on sopoirt pol pårteye XXX d' ene\n"
+"                    distribucion, XXX pout esse «main» (mwaisse båze),\n"
+"                    «contrib» (tîcès contribucions), «updates» (metaedjes\n"
+"                    a djoû) ou tot l' minme cwè k' a stî apontyî ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "dji n' sai aberweter li clé publike da «%s»"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - eployî li dnêye hårdêye pol djivêye des muroes,\n"
+"                   li prémetowe hårdêye est %s\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
 msgstr ""
-"  --no-uninstall - måy dimander po dizastaler on pacaedje, purade rinoncî.\n"
+"  --version      - eployî li dnêye modêye del distribucion, li prémetowe\n"
+"                   valixhance est l' cene do pacaedje «mandrake-release»\n"
+"                   d' astalé.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\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"
+"  --arch         - eployî li dnêye årtchitecteure, li prémetowe valixhance\n"
+"                   est l' cene do pacaedje «mandrake-release» d' astalé.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr ""
+"  --virtual      - ahiver on forveyou sopoirt ki sont tofer a djoû,\n"
+"                   rén ki l' protocole «file://» est permetou.\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - håyner les groupes ossu avou l' no.\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - dismete li verifiaedje di fitchîs MD5SUM.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "li sopoirt «%s» n' a nén stî tchoezi"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - netyî l' ridant muchete des tiestires.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - foirci l' askepiaedje des fitchîs «hdlist».\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "eployant on evironmint specifike so %s\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "dji n' pou radjouter des metaedjes a djoû d' ene distribucion cooker\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "dji n' sai trover li fitchî hdlist di «%s», dji passe houte do sopoirt"
+msgid "retrieving mirrors at %s ..."
+msgstr "aberwetaedje des muroes di %s..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr ""
+"nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr ""
-"  (              - åtchete di hintche po drovi on groupe di ratourneures.\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "dji n' pout mete a djoû l' sopoirt «%s»\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
+msgid "<relative path of hdlist> missing\n"
+msgstr "i manke li tchmin relatif pol fitchî hdlist\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - operateu binaire EYET, vraiy si les deus ratourneures "
-"sont vraiyes.\n"
+msgid "`with' missing for network media\n"
+msgstr "«with» manke pol sopoirt rantoele\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
+#, c-format
+msgid "unable to create medium \"%s\"\n"
+msgstr "dji n' pout radjouter l' sopoirt «%s»\n"
+
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"dji n' sai acceder å sopoirt «%s»,\n"
-"çoula pout arriver metans si vos avoz monté al mwin li ridant divant di "
-"radjouter l' sopoirt d' astalaedje."
+"Po s' è siervi: urpmi.removemedia [-a] <etikete> ...\n"
+"avou <etikete> li no do sopoirt a bodjî.\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - håyner l' etikete di groupe: group.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - tchoezi tos les sopoirts.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
+msgid ""
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --media        - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to create transaction"
-msgstr "dji n' sai ahiver ene transaccion"
+"\n"
+"tchuzes nén cnoxhowes «%s»\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "aberwetaedje des fitchîs rpms do sopoirt «%s»..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "rén a disastaler (eployîz urpmi.addmedia po-z adjouter on sopoirt\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"Vos avoz tchoezi on pacaedje côde sourdant:\n"
-"\n"
-"%s\n"
-"\n"
-"Probåblumint vos n' volîz nén l' astaler so vosse copiutrece (l' astaler\n"
-"vos permete di fé des candjmints å côde sourdant eyet del ricopiler).\n"
-"\n"
-"Cwè voloz vs fé?"
+"i gn a pont d' intrêye a bodjî\n"
+"(ene di %s)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "dji distribouwe %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"Po s' è siervi: urpmi.update [tchuzes] <etikete> ...\n"
+"avou <etikete> li no do sopoirt a mete a djoû.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "L' astalåcion a fwait berwete"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - mete a djoû rén kel sopoirt di metaedje a djoû.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "dji scrî l' fitchî d' apontiaedje [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - foircî l' metaedje a djoû del clé gpg.\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - tchoezi tos les sopoirts nén bodjåves.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - håyner l' etikete del epoke: epoch.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - verifyî li sinateure rpm divant d' astaler.\n"
-"                   (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
+"i gn a pont d' intrêye a mete a djoû\n"
+"(ene di %s)\n"
 
-#: ../urpmi:1
+#: ../urpmq:38
 #, 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]"
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf modêye %s\n"
+"Copyright © 2002-2004 MandrakeSoft.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s' è siervi:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:53
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - fé on sopoirt di metaedje a djoû.\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - djivêye des pacaedjes k' i gn a.\n"
 
-#: ../urpmq:1
+#: ../urpmq:54
+#, c-format
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - djivêye des sopoirts k' i gn a.\n"
+
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr ""
 "  --list-url     - djivêye des sopoirts k' i gn a et d' leus hårdêyes.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - foirci des cweraedjes rishonnants (come --fuzzy).\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - copiaedje di l' apontiaedje dizo cogne d' èn årgumint po "
+"urpmi.addmedia.\n"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "Ok"
-msgstr "'l est bon"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - djivêye des nuks k' i gn a (eployant --parallel).\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:58
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "discrijhaedje hdlist nén valide «%s» el fitchî hdlists"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - djivêye des alias k' i gn a.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:60
 #, c-format
-msgid "removing %s"
-msgstr "dji oistêye li pacaedje %s"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - saetchî les tiestires pol diné pacaedje a pårti del\n"
+"                   båze di dnêyes urpmi, et les håyner sol rexhowe\n"
+"                   sitandård (stdout) -- èn pout esse fwait ki pa root.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:62
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
-"   --distrib-XXX  - fé otomaticmint on sopoirt pol pårteye XXX d' ene\n"
-"                    distribucion, XXX pout esse «main» (mwaisse båze),\n"
-"                    «contrib» (tîcès contribucions), «updates» (metaedjes\n"
-"                    a djoû) ou tot l' minme cwè k' a stî apontyî ;-)\n"
+"  --sources      - diner tos les pacaedjes sourdant divant d' aberweter\n"
+"                   (èn pout esse fwait ki pa root).\n"
 
-#: ../urpmf:1
+#: ../urpmq:65
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - håyner l' etikete del grandeu: size.\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "in order to keep %s"
-msgstr "po wårder %s"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - håyner li djournå des candjmints.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:77
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "cåze di %s ki n' est nén satisfyî"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr ""
+"  -d             - sitinde li cweraedje åzès aloyances des pacaedjes.\n"
 
-#: ../_irpm:1
+#: ../urpmq:78
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"Astalaedje otomatike des pacaedjes...\n"
-"Vos avoz dmandé l' astalaedje do pacaedje %s\n"
+"  -u             - bodjî l' pacaedje foû del djivêye si ene modêye\n"
+"                   pus nouve est ddja astalêye.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:80
 #, c-format
-msgid "urpmi database locked"
-msgstr "båze di dnêyes urpmi serêye"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - rexhowe en etir avou l' pacaedjes a oister.\n"
 
-#: ../urpmi:1
+#: ../urpmq:82
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
+msgid "  -R             - reverse search to what requires package.\n"
 msgstr ""
-"  --resume       - rataker l' aberwetaedje des fitchîs rpm la wice k' il "
-"ont\n"
-"                   stî djokés (--no-resume po nel nén fé, prémetou=nén fé).\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
+"  -R             - fé l' ricweraedje å rvier, so çou k' a mezåjhe do "
+"pacaedje.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:85
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - dismete li verifiaedje di fitchîs MD5SUM.\n"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr ""
+"  -i             - håyner des ahessåvès informåcions, dins ene cogne po les "
+"djins.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "dji prind li bodjåve sopoirt come «%s»"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - håyner les groupes ossu avou l' no.\n"
 
-#: ../urpmi:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"Vos alez astaler li pacaedje shuvant so vosse copiutrece:\n"
-"\n"
-"%s\n"
-"\n"
-"Motoit vos vloz djusse li schaper. Cwè tchoezixhoz vs?"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - mostere li no, limeros di modêye eyet release.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:89
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - foirci des cweraedjes rishonnants (come -y).\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - djivêye des pacaedjes k' i gn a.\n"
 
-#: ../urpmq:1
+#: ../urpmq:90
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - bodjî l' pacaedje foû del djivêye si ene modêye\n"
-"                   pus nouve est ddja astalêye.\n"
+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"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:150
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - sayî di trover ey eployî fitchî «hdlist».\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
 
-#: ../urpm.pm:1
+#: ../urpmq:327
 #, c-format
-msgid "due to missing %s"
-msgstr "cåze di %s ki n' est nén la"
+msgid "skipping media %s: no hdlist\n"
+msgstr "dji passe houte do sopoirt: %s: pont d' «hdlist»\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:388
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
+msgid "No filelist found\n"
+msgstr "Nole djivêye di fitchîs di trovêye\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"Po s' è siervi: urpmi.update [tchuzes] <etikete> ...\n"
-"avou <etikete> li no do sopoirt a mete a djoû.\n"
+msgid "No changelog found\n"
+msgstr "Nou djournå des candjmints di trové\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "dji saye di passer houte do sopoirt «%s»"
+#~ 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:"
 
-#: ../urpme:1 ../urpmi:1
-#, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifyî si l' astalaedje si pout fé comufåt disk' al "
-"fén.\n"
+#~ msgid ""
+#~ "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"
+#~ 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"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "Programe d' aberwetaedje «%s» nén cnoxhou!!!\n"
@@ -2218,9 +2264,6 @@ msgstr ""
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "sayîz urpmf --help po vey les ôtès tchuzes"
 
-#~ msgid "no full media list was found"
-#~ msgstr "nole djivêye des sopoirts etire di trovêye"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "copiaedje del djivêye sourdant di «%s»..."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a1587f3c..89ab9064 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-27 12:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -39,841 +39,763 @@ msgstr "yY 是"
 msgid "Nn"
 msgstr "nN 否"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
+msgid "installing %s\n"
+msgstr "正在安装 %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "无法打开 rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"自动安装软件包...\n"
+"您要求安装软件包 %s\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息。\n"
+msgid "Is this OK?"
+msgstr "这样好了吗?"
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一才能安装 %s:"
+msgid "Ok"
+msgstr "确定"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
-msgstr "无法删除软件包 %s"
+msgid "Cancel"
+msgstr "取消"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
-msgstr "“%s”"
+msgid " (Y/n) "
+msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "无法与发行模式一起使用并行模式"
+msgid "%s: command not found\n"
+msgstr "%s: 命令没找到\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Everything already installed"
-msgstr "全部安装完成"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"用法：%s [选项]\n"
+"[选项]的格式为\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 直接清除软件包头缓存。\n"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "  -h|--help       - 打印帮助信息。\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "使用进程 %d 执行交易"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "  -g [组]         - 限制结果为给定组。\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
+msgid "                    defaults is %s.\n"
+msgstr "                    默认为 %s。\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:57
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:(1-%d)"
+msgid "unknown protocol defined for %s"
+msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "found %d headers in cache"
-msgstr "缓存中找到了 %d 个头"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "有多个文件名都为“%s”的 rpm 软件包"
+msgid "unable to handle protocol: %s"
+msgstr "无法处理协议: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - 指定用于代理认证的用户和\n"
-"                   口令(格式如 <用户: 口令>)。\n"
+msgid "syntax error in config file at line %s"
+msgstr "配置文件的第 %s 行语法错误"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "正在执行第二遍依赖关系的计算\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "正在获取 rpm 文件[%s]..."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:202
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...获取失败: %s"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "无法检查“%s”的列表文件，介质被忽略"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
 
-#: ../urpmf:1
+#: ../urpm.pm:213
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "无法决定此 hdlist 文件[%s]的介质"
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "无效的 rpm 文件名[%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "命令的代理声明无效\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 安装交易失败"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起，选择无效，请再试一次\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Choose location to save file"
-msgstr "选择保存文件的位置"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpmf:1
+#: ../urpm.pm:301
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:309
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Install it"
-msgstr "安装"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - 使用 X 界面。\n"
+msgid "taking removable device as \"%s\""
+msgstr "将可移动设备认作“%s”"
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - 根据运行环境选择最好的界面:\n"
-"                   X 或文本模式。\n"
+msgid "unable to write config file [%s]"
+msgstr "无法写入配置文件[%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "正在下载软件包“%s”..."
+msgid "write config file [%s]"
+msgstr "写入配置文件[%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:423
 #, c-format
-msgid "no package named %s"
-msgstr "没有叫做 %s 的软件包"
+msgid "examining parallel handler in file [%s]"
+msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - 在命令行选择所有匹配。\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "找到结点的并行处理: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安装失败，缺少下列文件:\n"
-"%s\n"
-"您可能需要更新您的 urpmi 数据库"
+msgid "using associated media for parallel mode: %s"
+msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"用法: urpmi.removemedia -a <名称> ...\n"
-"其中 <名称> 是要删除的介质名。\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "无法使用并行选项“%s”"
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n"
+"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
+"parallel 一起使用"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "`with' missing for network media\n"
-msgstr "“with”找不到网络介质\n"
+msgid "examining synthesis file [%s]"
+msgstr "正在检查综合文件 [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - 列出软件包中的文件。\n"
+msgid "examining hdlist file [%s]"
+msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpme:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unknown package"
-msgstr "未知的软件包"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid "Installation is possible"
-msgstr "可以安装"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpmi:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
+msgid "performing second pass to compute dependencies\n"
+msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:563
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
+msgid "skipping package %s"
+msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:572
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
+msgid "would install instead of upgrade package %s"
+msgstr "将安装而非升级软件包 %s"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
+msgid "unable to open rpmdb"
+msgstr "无法打开 rpmdb"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:622
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "无法添加 cooker 发行版的更新\n"
+msgid "medium \"%s\" already exists"
+msgstr "介质“%s”已存在"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:629
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             -详细的提示。\n"
+msgid "virtual medium need to be local"
+msgstr "虚拟介质必须位于本地"
 
-#: ../urpmi:1
+#: ../urpm.pm:661
 #, c-format
-msgid "Initializing..."
-msgstr "正在初始化..."
+msgid "added medium %s"
+msgstr "已添加介质 %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:677
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 列出可用的软件包。\n"
+msgid "unable to access first installation medium"
+msgstr "无法访问介质的首次安装"
 
-#: ../urpmf:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - 打印全部标识符。\n"
+msgid "copying hdlists file..."
+msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "非连贯介质“%s”标为可移动但实际不是"
+msgid "...copying failed"
+msgstr "...复制失败"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
+msgid "...copying done"
+msgstr "...复制完成"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 
-#: ../urpmi:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
+msgid "retrieving hdlists file..."
+msgstr "正在获取 hdlists 文件..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "准备好后按 Enter 键..."
+msgid "...retrieving done"
+msgstr "...获取完成"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项“%s”\n"
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:720
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
-"                   较小的交易。默认为 %d。\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:765
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - 用 wget 取远程文件。\n"
+msgid "selecting multiple media: %s"
+msgstr "选择多个介质: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:767
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
+msgid "\"%s\""
+msgstr "“%s”"
 
-#: ../urpmq:1
+#: ../urpm.pm:783
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
+msgid "removing medium \"%s\""
+msgstr "删除介质“%s”"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:943
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "正在创建 hdlist [%s]"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"无法访问介质“%s”，\n"
+"这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:996
 #, c-format
 msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "正在检查 MD5SUM 文件"
+msgid "copying description file of \"%s\"..."
+msgstr "正在复制“%s”的描述文件..."
 
-#: ../_irpm:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: 命令没找到\n"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "unable to register rpm file"
-msgstr "无法访问注册 rpm 文件"
+msgid "examining MD5SUM file"
+msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
-"                   就安装软件包。\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "无法处理协议: %s"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "正在获取 hdlists 文件..."
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "Yes, really install it"
-msgstr "是，进行安装"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "added medium %s"
-msgstr "已添加介质 %s"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpmi:1
+#: ../urpm.pm:1174
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
+msgid "reading rpm files from [%s]"
+msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum 不匹配"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "配置文件的第 %s 行语法错误"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1396
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
-"                   1080(格式如 <proxyhost[:port]>)。\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "in order to install %s"
-msgstr "为了安装 %s"
+msgid "md5sum mismatch"
+msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "depslist 中重新分配了 %s 项"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpmf:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - 忽略各种情况下的冲突。\n"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpmi:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "无法创建故障报告的目录 [%s]"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "将安装而非升级软件包 %s"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "正在获取 %s 处的镜像..."
+msgid "unable to write list file of \"%s\""
+msgstr "无法写入“%s”的列表文件"
 
-#: ../urpmf:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - 打印标识符 url: url。\n"
+msgid "writing list file for medium \"%s\""
+msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1588
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s 中定义了未知的协议"
+msgid "nothing written in list file for \"%s\""
+msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpmq:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - 和名称一起打印版本和发行号。\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpmf:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "介质“%s”已存在"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../_irpm:1
+#: ../urpm.pm:1679
 #, c-format
-msgid "installing %s\n"
-msgstr "正在安装 %s\n"
+msgid "reading headers from medium \"%s\""
+msgstr "正在从介质“%s”读取头"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1684
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要升级的项\n"
-"(%s 中之一)\n"
+msgid "building hdlist [%s]"
+msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "trying to promote %s"
-msgstr "正在试图推广 %s"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to remove package %s"
-msgstr "无法删除软件包 %s"
+msgid "found %d headers in cache"
+msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的综合文件出现问题"
+msgid "removing %d obsolete headers in cache"
+msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1893
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要删除的项\n"
-"(%s中的一个)\n"
+msgid "mounting %s"
+msgstr "正在装载 %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - 选择所有介质。\n"
+msgid "unmounting %s"
+msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1928
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "缺少签名(%s)"
+msgid "relocated %s entries in depslist"
+msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "无法从[%s]读取 rpm 文件: %s"
+msgid "no entries relocated in depslist"
+msgstr "depslist 中没有重新分配项"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+msgid "invalid rpm file name [%s]"
+msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "复制 [%s] 失败(文件太小了)"
+msgid "retrieving rpm file [%s] ..."
+msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - 只使用更新介质。\n"
+msgid "unable to access rpm file [%s]"
+msgstr "无法访问 rpm 文件[%s]"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1960
 #, c-format
-msgid " (Y/n) "
-msgstr "(是(Y)/否(n))[是]"
+msgid "unable to register rpm file"
+msgstr "无法访问注册 rpm 文件"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1963
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "  -g [组]         - 限制结果为给定组。\n"
+msgid "error registering local packages"
+msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
+msgid "no package named %s"
+msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "输入格式错误: [%s]"
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
 
-#: ../urpme:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "如果删除软件包 %s 会破坏您的系统"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - 列出可用的介质。\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpmi:1
+#: ../urpm.pm:2362
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
 msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s"
-
-#: ../urpmi:1
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
+"介质“%s”使用了无效的列表文件:\n"
+"  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "depslist 中没有重新分配项"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpmi:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
+msgid "package %s is not found."
+msgstr "未找到软件包 %s。"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - 用 crul 取远程文件。\n"
+msgid "urpmi database locked"
+msgstr "urpmi 数据库已锁定"
 
-#: ../urpmf:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
+msgid "medium \"%s\" is not selected"
+msgstr "介质“%s”未选中"
 
-#: ../urpmi:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "do you agree ?"
-msgstr "您同意吗?"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "“%s”的列表文件不连贯，介质被忽略"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "...retrieving done"
-msgstr "...获取完成"
+msgid "unable to access medium \"%s\""
+msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2635
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
+msgid "malformed input: [%s]"
+msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "skipping package %s"
-msgstr "跳过软件包 %s"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "无效的签名(%s)"
+msgid "Preparing..."
+msgstr "正在准备..."
 
-#: ../urpmq:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  需要在命令行给出名称或 rpm 文件。\n"
+msgid "using process %d for executing transaction"
+msgstr "使用进程 %d 执行交易"
 
-#: ../urpmi:1
+#: ../urpm.pm:2783
 #, c-format
 msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi 版本 %s\n"
-"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "无法正确处理[%s]为值“%s”"
-
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "无法决定此 hdlist 文件[%s]的介质"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "无法处理“%s”的 hdlist 文件"
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
+msgid "unable to create transaction"
+msgstr "无法创建交易"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
+msgid "removing package %s"
+msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "删除缓存中的 %d 个过时头"
+msgid "unable to remove package %s"
+msgstr "无法删除软件包 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法更新介质“%s”\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+msgid "unable to install package %s"
+msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "虚拟介质“%s”不是本地的，介质被忽略"
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
+msgid "due to unsatisfied %s"
+msgstr "原因是不满足 %s"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    默认为 %s。\n"
+msgid "trying to promote %s"
+msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
+msgid "in order to keep %s"
+msgstr "为了保留 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
+msgid "in order to install %s"
+msgstr "为了安装 %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - 不搜索提供标签中的软件包。\n"
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "复制[%s]失败(md5sum 不匹配)"
+msgid "unrequested"
+msgstr "未请求"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
-"  --use-distrib  - 配置 urpmi 实时从发行树中抓取。这将允许查询发行版。\n"
+msgid "Invalid signature (%s)"
+msgstr "无效的签名(%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"用法：%s [选项]\n"
-"[选项]的格式为\n"
+msgid "Invalid Key ID (%s)"
+msgstr "无效的密钥 ID(%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "   --clean        -  首先删除缓存中的rpm。\n"
+msgid "Missing signature (%s)"
+msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
+msgid "bad proxy declaration on command line\n"
+msgstr "命令的代理声明无效\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -889,1052 +811,1175 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 打印帮助信息。\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包。\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
-"  <url> 为以下之一\n"
-"       file://<路径>\n"
-"       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       removable://<路径>\n"
-"\n"
-"而 [options] 可以来自\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...复制完成"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "无法使用并行选项“%s”"
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"介质“%s”使用了无效的列表文件:\n"
-"  介质可能不是最新，正在尝试使用其它方式"
+"  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
+"                   下安装/卸载 chroot。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "无法访问介质的首次安装"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             -详细的提示。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "虚拟介质必须位于本地"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "注册本地软件包出错"
+msgid "unknown packages"
+msgstr "未知的软件包"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - 降低下载速度。\n"
+msgid "unknown package"
+msgstr "未知的软件包"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "发现探测的 hdlist(或综合文件) 为 %s"
+msgid "removing package %s will break your system"
+msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "获取源 hdlist(或综合文件) 失败"
+msgid "Nothing to remove"
+msgstr "不需要删除任何东西。"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 中未发现 rpm 文件"
+msgid "Checking to remove the following packages"
+msgstr "检查删除下列软件包"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "“%s”的列表文件中没有写入内容"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签名有错误"
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
+msgid "removing %s"
+msgstr "正在删除 %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - 要删除的软件包的完整输出。\n"
+msgid "Removing failed"
+msgstr "删除失败"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002 MandrakeSoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "无法安装软件包 %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - 允许提示用户安装软件包而不\n"
-"                   检查依赖性和完整性。\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "保存文件"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             -详细的提示。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "无法写入配置文件[%s]"
+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"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - 不打印相同行。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "无效的密钥 ID(%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - 打印全部标识符。\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - 打印标识符组: 分组。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法获取可移动介质“%s”的路径名称"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - 打印标识符大小: 大小。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   -打印标识符描述: 描述。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist相对路径>找不到\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "检查删除下列软件包"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "未请求"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "无法访问 rpm 文件[%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - 打印标识符 url: url。\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - 打印文件标识符: 所有文件。\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "无法处理文件[%2$s]中的“%1$s”"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - 打印文件标识符: 所有文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
+
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpmi:1
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
-"                   下安装 chroot。\n"
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "创建介质“%s”的 hdlist 综合文件"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
-"                   下安装/卸载 chroot。\n"
+"  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - 左括号用来打开一组表达。\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - 右括号用来关闭一组表达。\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
+"callback is :\n"
+"%s\n"
+msgstr ""
+"召回是:\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "正在拆卸 %s"
+msgid "using specific environment on %s\n"
+msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        已完成 %s%%，速度 = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 版本 %s\n"
+"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "正在重新启动 urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "正在检查综合文件 [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...复制失败"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
+"  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
+"                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - 安静模式。\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             -详细的提示。\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
-msgstr ""
-"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
-"                   用 stdout 输出(root 专用)。\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "未知的软件包"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "选择多个介质: %s"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
+"                   就安装软件包。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "文件[%s]已经在相同的介质“%s”中使用"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - 允许提示用户安装软件包而不\n"
+"                   检查依赖性和完整性。\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
+"                   下安装 chroot。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "找不到“%s”的列表文件，介质被忽略"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "  -h|--help       - 打印帮助信息。\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "找到结点的并行处理: %s"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"召回是:\n"
-"%s\n"
+"  --resume       - 续传未下载完成的文件\n"
+"                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - 逆序搜索所需的软件包。\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
+"                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002 MandrakeSoft.\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
+"  --proxy-user   - 指定用于代理认证的用户和\n"
+"                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet         - 不打印标题名称(如果没有在命令行指定标识符，默认设置\n"
-"就是不打印，\n"
-"与会话方式不相兼容)。\n"
+"  --bug          - 输出故障报告\n"
+"                   下一个参数指定输出目录。\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - 不打印相同行。\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
-"parallel 一起使用"
+"  --best-output  - 根据运行环境选择最好的界面:\n"
+"                   X 或文本模式。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
-"                   架构。\n"
+"  --verify-rpm   - 安装之前验证 rpm 签署。\n"
+"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "这样好了吗?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "正在检查文件[%s]中的并行处理"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "不需要删除任何东西。"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...从公钥文件“%s”中导入了密钥 %s"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "正在从介质“%s”读取头"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - 扩展软件包依赖性查询。\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
-"  --bug          - 输出故障报告\n"
-"                   下一个参数指定输出目录。\n"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "介质“%s”没有定义任何 rpm 文件的位置"
+msgid "Choose location to save file"
+msgstr "选择保存文件的位置"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "无法写入“%s”的列表文件"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"您选择了源软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
+"行编译)。\n"
+"\n"
+"您想要执行什么操作?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
+msgid "Do nothing"
+msgstr "什么也不做"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "试图选择不存在的介质“%s”"
+msgid "Yes, really install it"
+msgstr "是，进行安装"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   -打印标识符描述: 描述。\n"
+msgid "Save file"
+msgstr "保存文件"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "复制失败"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"您即将在您的计算机上安装下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+msgid "Install it"
+msgstr "安装"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes 仅能和 --parallel 一起使用"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "介质“%s”未发现 hdlist 文件"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
+msgid "Copying failed"
+msgstr "复制失败"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "正在安装 %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "只允许超级用户安装软件包"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "正在从[%s]读取 rpm 文件"
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "正在复制“%s”的描述文件..."
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包。\n"
+msgid "Package installation..."
+msgstr "软件包安装..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "删除失败"
+msgid "Initializing..."
+msgstr "正在初始化..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "未找到软件包 %s。"
+msgid "do you agree ?"
+msgstr "您同意吗?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "删除介质“%s”"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:505
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
+"%s\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+msgid "unable to get source packages, aborting"
+msgstr "无法读取源软件包，中止"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:541
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "无法访问介质“%s”"
+msgid "Press Enter when ready..."
+msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质“%s”\n"
+msgid "Downloading package `%s'..."
+msgstr "正在下载软件包“%s”..."
 
-#: ../urpmf:1
+#: ../urpmi:597
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
 
-#: ../urpmq:1
+#: ../urpmi:600
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        已完成 %s%%，速度 = %s"
+
+#: ../urpmi:619
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "下列软件包的签名有错误"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "您想继续安装吗?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
+"安装失败，缺少下列文件:\n"
 "%s\n"
+"您可能需要更新您的 urpmi 数据库"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - 打印全部更新日志。\n"
+msgid "Installation failed"
+msgstr "安装失败"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的列表文件，介质被忽略"
+msgid "distributing %s"
+msgstr "正在分发 %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - 右括号用来关闭一组表达。\n"
+msgid "installing %s"
+msgstr "正在安装 %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "正在检查 hdlist 文件 [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "正在复制 hdlists 文件..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "正在写入介质“%s”的列表文件"
+msgid "%d installation transactions failed"
+msgstr "%d 安装交易失败"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
+msgid "Installation is possible"
+msgstr "可以安装"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
+msgid "Everything already installed"
+msgstr "全部安装完成"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "什么也不做"
+msgid "restarting urpmi"
+msgstr "正在重新启动 urpmi"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "并行模式时使用关联介质: %s"
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
+"  <url> 为以下之一\n"
+"       file://<路径>\n"
+"       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       removable://<路径>\n"
+"\n"
+"而 [options] 可以来自\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "mounting %s"
-msgstr "正在装载 %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "无法读取源软件包，中止"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
+"                   主要、贡献、更新或任何其它的配置。 ;-)\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "无法导入“%s”的公共密钥文件"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"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"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
 msgstr ""
-"urpmq 版本 %s\n"
-"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
+"  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
+"                   架构。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:72
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
+msgid ""
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - 打印组名。\n"
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "介质“%s”未选中"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "只允许超级用户安装软件包"
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "在 %s 使用指定环境\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
+msgid "retrieving mirrors at %s ..."
+msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - 小交易长度，默认为 %d。\n"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - 左括号用来打开一组表达。\n"
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法更新介质“%s”\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移动介质“%s”的载入点太多"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist相对路径>找不到\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
+msgid "`with' missing for network media\n"
+msgstr "“with”找不到网络介质\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
-msgstr ""
-"无法访问介质“%s”，\n"
-"这可能是因为您在创建介质时是手动装载的目录。"
+msgid "unable to create medium \"%s\"\n"
+msgstr "无法创建介质“%s”\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - 打印标识符组: 分组。\n"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"用法: urpmi.removemedia -a <名称> ...\n"
+"其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "无法创建交易"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知的选项“%s”\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "正在从介质“%s”上获取 rpm 文件..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"您选择了源软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改然后进\n"
-"行编译)。\n"
-"\n"
-"您想要执行什么操作?"
+"找不到要删除的项\n"
+"(%s中的一个)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "正在分发 %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"用法: urpmi.update [选项] <名称> ...\n"
+"其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - 只使用更新介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "写入配置文件[%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - 打印标识符周期: 周期。\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - 安装之前验证 rpm 签署。\n"
-"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
+"找不到要升级的项\n"
+"(%s 中之一)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002 MandrakeSoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请插入标签“%s”的介质到设备 [%s]"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质。\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "确定"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
-"  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
-"                   主要、贡献、更新或任何其它的配置。 ;-)\n"
-
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - 打印标识符大小: 大小。\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "为了保留 %s"
+"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
+"                   用 stdout 输出(root 专用)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "原因是不满足 %s"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"自动安装软件包...\n"
-"您要求安装软件包 %s\n"
+"  --use-distrib  - 配置 urpmi 实时从发行树中抓取。这将允许查询发行版。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi 数据库已锁定"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - 打印全部更新日志。\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - 续传未下载完成的文件\n"
-"                   (--no-resume 禁用它，默认是禁用的)。\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "正在检查“%s”的公共密钥文件..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "将可移动设备认作“%s”"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - 逆序搜索所需的软件包。\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"您即将在您的计算机上安装下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您也可以选择只是保存相应的软件包。您要进行什么操作?"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - 列出软件包中的文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质。\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"用法: urpmi.update [选项] <名称> ...\n"
-"其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:388
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "试图跳过已有介质“%s”，避免中"
+msgid "No filelist found\n"
+msgstr ""
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - 验证安装是否可以正确进行。\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "需要下列软件包之一才能安装 %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq 版本 %s\n"
+#~ "版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
+#~ "\n"
+#~ "用法:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "未知 webfetch“%s”!!!\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d9263a80..1ea667c7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-05 14:19+0200\n"
+"POT-Creation-Date: 2004-05-18 22:20+0200\n"
 "PO-Revision-Date: 2004-04-17 21:32+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -45,838 +45,763 @@ msgstr "Yy是"
 msgid "Nn"
 msgstr "Nn否"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
 #, c-format
-msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - 自動從安裝媒體建立全部媒體.\n"
+msgid "installing %s\n"
+msgstr "正在安裝 %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "無法開啟 rpmdb"
+msgid ""
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"自動套件安裝...\n"
+"您要求安裝的套件 %s\n"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:33 ../urpme:29 ../urpmi:509
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 顯示此說明訊息.\n"
+msgid "Is this OK?"
+msgstr "這樣可以嗎?"
 
-#: ../urpmi:1
+#: ../_irpm:35 ../urpm/msg.pm:40
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "須要安裝下列其中之一套件 %s:"
+msgid "Ok"
+msgstr "確定"
 
-#: ../urpm.pm:1
+#: ../_irpm:36 ../urpm/msg.pm:41
 #, c-format
-msgid "removing package %s"
-msgstr "正在移除套件 %s"
+msgid "Cancel"
+msgstr "取消"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:445 ../urpmi:517
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid " (Y/n) "
+msgstr " (Y/n) (是/否) "
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "Can't use parallel mode with use-distrib mode"
-msgstr "無法於 use-distrib 模式下使用平行模式"
+msgid "%s: command not found\n"
+msgstr "%s:找不到指令\n"
 
-#: ../urpmi:1
+#: ../rpm-find-leaves:11
 #, c-format
-msgid "Everything already installed"
-msgstr "每一個東西都已經安裝了"
+msgid ""
+"usage: %s [options]\n"
+"where [options] are from\n"
+msgstr ""
+"使用法: %s [選項]\n"
+"其中 [選項] 是從\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../rpm-find-leaves:13
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 清除標頭 cache 目錄.\n"
+msgid "   -h|--help      - print this help message.\n"
+msgstr "   -h|--help      - 顯示此說明訊息.\n"
 
-#: ../urpm.pm:1
+#: ../rpm-find-leaves:14
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "正在使用 %d 程序以執行交易"
+msgid "   -g [group]     - restrict results to given group.\n"
+msgstr "   -g [group]     - 限制結果到給定的群組.\n"
 
-#: ../urpmf:1
+#: ../rpm-find-leaves:15
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides     - 顯示標籤提供: 全部提供.\n"
+msgid "                    defaults is %s.\n"
+msgstr "                    預設為 %s.\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:57
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "何者是您的選擇? (1-%d) "
+msgid "unknown protocol defined for %s"
+msgstr "未知的通訊協定項目定義於 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:79
 #, c-format
-msgid "found %d headers in cache"
-msgstr "在 cache 找到 %d 個標頭"
+msgid "no webfetch found, supported webfetch are: %s\n"
+msgstr "沒有找到 webfetch, 支援的 webfetch 有: %s\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:95
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "有多個套件有相同 rpm 檔案名稱 \"%s\""
+msgid "unable to handle protocol: %s"
+msgstr "無法處理通訊協定: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:137 ../urpm.pm:150 ../urpm.pm:163
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - 指定 proxy 認證的使用者與密碼\n"
-"                   (格式為 <user:password>).\n"
+msgid "syntax error in config file at line %s"
+msgstr "語法錯誤於設定檔內的第 %s 行"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:174
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "正在執行第二部相依性的計算\n"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist, 忽略媒體"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:180
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "正在擷取 rpms 檔案 [%s] ..."
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的清單, 忽略媒體"
 
-#: ../urpmq:1
+#: ../urpm.pm:196
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - 列出可用的平行別名.\n"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "無法處理媒體 \"%s\" 因為另一個媒體正在使用清單檔"
 
-#: ../urpm.pm:1 ../urpmi:1 ../urpmi.addmedia:1
+#: ../urpm.pm:202
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...擷取失敗: %s"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "無法使用名稱 \"%s\" 給未命名的媒體因為它已經被使用了"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:209
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "無法檢查 \"%s\" 的清單檔案, 忽略這個媒體"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "不會考慮使用媒體 \"%s\" 因為無清單檔案 [%s] 存在"
 
-#: ../urpmf:1
+#: ../urpm.pm:213
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr "  -o             - 二元 OR 運算子, 真值若一者為真.\n"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "無法決定這個 hdlist 檔案 [%s] 的媒體"
 
-#: ../urpmi:1
+#: ../urpm.pm:222
 #, c-format
-msgid "Package installation..."
-msgstr "套件安裝..."
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "無法存取 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:224 ../urpm.pm:2343
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "無效的 rpm 檔案名稱 [%s]"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "無法存取 \"%s\" 的清單檔, 忽略這個媒體"
 
-#: ../urpm/args.pm:1
+#: ../urpm.pm:249
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "於命令列上有壞的 proxy 宣告\n"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "正在嘗試避開現存的媒體  \"%s\" , 正在避免"
 
-#: ../urpmi:1
+#: ../urpm.pm:257
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 安裝處理失敗"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "虛擬媒體 \"%s\" 不應該有定義 hdlist 或清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:262
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "無法存取第一個安裝媒體 (找不到 Mandrake/base/hdlists 檔案)"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url, 忽略這個媒體"
 
-#: ../urpm/msg.pm:1
+#: ../urpm.pm:271
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "對不起, 錯誤選擇, 再試一次\n"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "無法找到 \"%s\" hdlist 檔案, 忽略這個媒體"
 
-#: ../urpmi:1
+#: ../urpm.pm:278
 #, c-format
-msgid "Choose location to save file"
-msgstr "選擇存檔的位置"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "無法找到 \"%s\" 清單檔案, 忽略這個媒體"
 
-#: ../urpmf:1
+#: ../urpm.pm:301
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - 列印標籤摘要: 摘要.\n"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "前後不一致的 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:309
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "以下套件包含 %s: %s"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "無法檢查 \"%s\" 的清單檔案, 忽略這個媒體"
 
-#: ../urpmi:1
+#: ../urpm.pm:342
 #, c-format
-msgid "Install it"
-msgstr "安裝它"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "可移動式媒體 \"%s\" 的掛載點過多"
 
-#: ../urpmi:1
+#: ../urpm.pm:343
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - 使用 X 界面.\n"
+msgid "taking removable device as \"%s\""
+msgstr "將可移動式裝置當成 \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:347
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列其中一個套件:"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "使用不同的可移動式裝置 [%s] 於 \"%s\" "
 
-#: ../urpme:1
+#: ../urpm.pm:352 ../urpm.pm:355
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "為了滿足相依性, 下列套件將會被移除 (%d MB)"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "無法擷取移動式媒體 \"%s\" 的路徑名稱"
 
-#: ../urpmi:1
+#: ../urpm.pm:368
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - 按照環境選擇最佳的界面:\n"
-"                   X 或文字模式.\n"
+msgid "unable to write config file [%s]"
+msgstr "無法寫入設定檔 [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:390
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "正在下載套件 `%s'..."
+msgid "write config file [%s]"
+msgstr "寫入設定檔 [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:402
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "當使用 --install-src 時隨著二元 rpm 檔案可做的事"
+msgid "Can't use parallel mode with use-distrib mode"
+msgstr "無法於 use-distrib 模式下使用平行模式"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:412
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自動選擇升級系統的套件.\n"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "無法解析 %s 檔案內的 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:423
 #, c-format
-msgid "no package named %s"
-msgstr "沒有套件命名為 %s"
+msgid "examining parallel handler in file [%s]"
+msgstr "檢驗 [%s] 檔案內的平行處理器"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:433
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - 選擇命令列中所有符合項目.\n"
+msgid "found parallel handler for nodes: %s"
+msgstr "在 %s 發現節點的處理器"
 
-#: ../urpmi:1
+#: ../urpm.pm:437
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安裝失敗, 某些檔案遺失:\n"
-"%s\n"
-"您或許要更新您的 urpmi 資料庫"
+msgid "using associated media for parallel mode: %s"
+msgstr "使用相關媒體於平行模式: %s"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:441
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"用法: urpmi.removemedia [-a] <名稱> ...\n"
-"其中 <名稱> 是要移除的媒體名稱.\n"
+msgid "unable to use parallel option \"%s\""
+msgstr "無法使用平行選項 \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:452
 #, c-format
 msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"安裝無法繼續因為下列套件必須移除給其他套件來升級:\n"
-"%s\n"
-
-#: ../urpmi.addmedia:1
-#, c-format
-msgid "`with' missing for network media\n"
-msgstr "用網路媒體時遺漏了 `with'\n"
-
-#: ../urpmq:1
-#, c-format
-msgid "  -l             - list files in package.\n"
-msgstr "  -l             - 顯示套件檔案.\n"
-
-#: ../urpme:1
-#, c-format
-msgid "unknown package"
-msgstr "未知的套件"
+"--synthesis 不能夠與 --media, --excludemedia, --sortmedia, --update 與 --"
+"parallel 使用"
 
-#: ../urpmi:1
+#: ../urpm.pm:503 ../urpm.pm:529 ../urpm.pm:895 ../urpm.pm:906 ../urpm.pm:967
+#: ../urpm.pm:984 ../urpm.pm:1067 ../urpm.pm:1124 ../urpm.pm:1307
+#: ../urpm.pm:1415 ../urpm.pm:1519 ../urpm.pm:1525 ../urpm.pm:1626
+#: ../urpm.pm:1705 ../urpm.pm:1709
 #, c-format
-msgid "Installation is possible"
-msgstr "安裝為可能的"
+msgid "examining synthesis file [%s]"
+msgstr "檢驗綜合檔案 [%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:507 ../urpm.pm:522 ../urpm.pm:535 ../urpm.pm:898 ../urpm.pm:909
+#: ../urpm.pm:973 ../urpm.pm:979 ../urpm.pm:1072 ../urpm.pm:1128
+#: ../urpm.pm:1311 ../urpm.pm:1419 ../urpm.pm:1513 ../urpm.pm:1531
+#: ../urpm.pm:1715
 #, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"下列套件必須移除給其他套件來升級:\n"
-"%s"
-
-#: ../urpmi:1
-#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed "
-"(%d MB)"
-msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
+msgid "examining hdlist file [%s]"
+msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:517 ../urpm.pm:902
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "不會考慮使用媒體 \"%s\" 因為無清單檔案 [%s] 存在"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "虛擬媒體 \"%s\" 並非本地端, 忽略這個媒體"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:545 ../urpm.pm:916 ../urpm.pm:992 ../urpm.pm:1076
+#: ../urpm.pm:1423
 #, c-format
-msgid " (y/N) "
-msgstr " (y/N) (是/否) "
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "讀取 \"%s\" 媒體的 hdlist 或綜合檔案發生問題"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:551 ../urpm.pm:1665
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "無法新增 cooker 發行版的更新\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "正在執行第二部相依性的計算\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:563
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             - 完整資訊模式.\n"
+msgid "skipping package %s"
+msgstr "正在略過套件 %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:572
 #, c-format
-msgid "Initializing..."
-msgstr "初始化中..."
+msgid "would install instead of upgrade package %s"
+msgstr "會要安裝而非升級套件 %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:583 ../urpm.pm:2139 ../urpm.pm:2202 ../urpm.pm:2779
+#: ../urpm.pm:2877
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 列出可用的的套件.\n"
+msgid "unable to open rpmdb"
+msgstr "無法開啟 rpmdb"
 
-#: ../urpmf:1
+#: ../urpm.pm:622
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - 列印全部標籤.\n"
+msgid "medium \"%s\" already exists"
+msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:629
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "前後不一致的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
+msgid "virtual medium need to be local"
+msgstr "虛擬媒體需要是本地的"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:661
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "虛擬媒體 \"%s\" 不應該有定義 hdlist 或清單檔案, 忽略這個媒體"
+msgid "added medium %s"
+msgstr "加入的媒體 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:677
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "正在計算被複製的來源 hdlist (或綜合) 的 md5sum"
+msgid "unable to access first installation medium"
+msgstr "無法存取第一個安裝媒體"
 
-#: ../urpmi:1
+#: ../urpm.pm:681
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - 排除以逗號分開的路徑.\n"
+msgid "copying hdlists file..."
+msgstr "複製 hdlist 檔案..."
 
-#: ../urpmi:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1096 ../urpm.pm:1159
+#: ../urpm.pm:1216 ../urpm.pm:1371 ../urpm.pm:1377
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "準備好時請按 Enter..."
+msgid "...copying failed"
+msgstr "...複製失敗"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:683 ../urpm.pm:1007 ../urpm.pm:1100
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知選項 '%s'\n"
+msgid "...copying done"
+msgstr "...複製完成"
 
-#: ../urpmi:1
+#: ../urpm.pm:685 ../urpm.pm:704 ../urpm.pm:732
 #, c-format
 msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-
-#: ../urpm.pm:1
-#, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "讀取 \"%s\" 媒體的 hdlist 或綜合檔案發生問題"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "無法存取第一個安裝媒體 (找不到 Mandrake/base/hdlists 檔案)"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:691
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - 使用 wget 擷取遠端檔案.\n"
+msgid "retrieving hdlists file..."
+msgstr "擷取 hdlists 檔案..."
 
-#: ../urpmi:1
+#: ../urpm.pm:698 ../urpm.pm:1405 ../urpm.pm:1950 ../urpm.pm:2652
+#: ../urpmi.addmedia:137
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - 允許於 provides 中搜尋以找到套件.\n"
+msgid "...retrieving done"
+msgstr "...擷取完成"
 
-#: ../urpmq:1
+#: ../urpm.pm:700 ../urpm.pm:1389 ../urpm.pm:1398 ../urpm.pm:1953
+#: ../urpm.pm:2654 ../urpmi:608 ../urpmi.addmedia:139
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - 當使用 --parallel 時列出可用的節點.\n"
+msgid "...retrieving failed: %s"
+msgstr "...擷取失敗: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:720
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "正在建立 hdlist [%s]"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlists 檔案中有無效的 hdlist 敘述 \"%s\""
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:765
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - 盡可能保留存在的套件, 拒絕                  會導致移除的被"
-"要求的套件.\n"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "正在檢驗 MD5SUM 檔案"
+msgid "selecting multiple media: %s"
+msgstr "正在選擇多個媒體: \"%s\""
 
-#: ../_irpm:1
+#: ../urpm.pm:767
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s:找不到指令\n"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: ../urpm.pm:1
+#: ../urpm.pm:783
 #, c-format
-msgid "unable to register rpm file"
-msgstr "無法註冊 rpm 檔案"
+msgid "removing medium \"%s\""
+msgstr "移除媒體 \"%s\""
 
-#: ../urpmi:1
+#: ../urpm.pm:943
 #, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
-"  --allow-nodeps - 允許要求使用者不檢查相依性\n"
-"                   安裝套件.\n"
+"無法存取媒體 \"%s\",\n"
+"這在你建立媒體時手動掛載目錄時有可能發生."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "無法處理通訊協定: %s"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "虛擬媒體 \"%s\" 應該有有效的來源 hdlist 或綜合, 忽略這個媒體"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1004
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "擷取 hdlists 檔案..."
+msgid "copying description file of \"%s\"..."
+msgstr "複製 \"%s\" 的敘述檔案..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1027 ../urpm.pm:1267
 #, c-format
-msgid "Yes, really install it"
-msgstr "是的, 實在安裝它"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "計算來源 hdlist 的 md5sum (或綜合)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1038 ../urpm.pm:1278
 #, c-format
-msgid "added medium %s"
-msgstr "加入的媒體 %s"
+msgid "examining MD5SUM file"
+msgstr "正在檢驗 MD5SUM 檔案"
 
-#: ../urpmi:1
+#: ../urpm.pm:1092
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - 保留 cache 中未使用的 rpm.\n"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在複製 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1105
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "建立交易給 %s 上的安裝 (移除=%d, 安裝=%d, 升級=%d)"
+msgid "copy of [%s] failed (file is suspiciously small)"
+msgstr "複製 [%s] 失敗 (檔案可疑的小)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1109
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum 不合"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "正在計算被複製的來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1111
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "語法錯誤於設定檔內的第 %s 行"
+msgid "copy of [%s] failed (md5sum mismatch)"
+msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpmi:1
+#: ../urpm.pm:1132 ../urpm.pm:1315 ../urpm.pm:1629
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  於命令列指定的名稱或 rpm 檔案將會被安裝.\n"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "讀取 \"%s\" 媒體的綜合檔案發生問題"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1174
 #, c-format
-msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - 使用指定的 HTTP proxy, port number 被假設\n"
-"                   為1080 為預設值 (格式為 <proxyhost[:port]>).\n"
+msgid "reading rpm files from [%s]"
+msgstr "由 [%s] 讀取 rpm 檔案"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1199
 #, c-format
-msgid "in order to install %s"
-msgstr "為了要安裝 %s"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "無法由 [%s] 讀取 rpm 套件: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1204
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "重新安置 %s 項目於 depslist"
+msgid "no rpm files found from [%s]"
+msgstr "在 [%s] 內找不到 rpm 檔案"
 
-#: ../urpmf:1
+#: ../urpm.pm:1333
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - 於每一個樣式中忽略大小寫分別.\n"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在擷取 \"%s\" 的來源 hdlist (或綜合)..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1356
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "無法建立 [%s] 目錄給臭蟲回報"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "發現探查到的 hdlist (或綜合) 為 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1396
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "會要安裝而非升級套件 %s"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "正在計算來源 hdlist (或綜合) 的 md5sum"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1398
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "正在擷取鏡射站台於 %s ..."
+msgid "md5sum mismatch"
+msgstr "md5sum 不合"
 
-#: ../urpmf:1
+#: ../urpm.pm:1483
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - 顯示標籤 url: url.\n"
+msgid "retrieval of source hdlist (or synthesis) failed"
+msgstr "擷取來源 hdlist (或綜合) 失敗"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1490
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "未知的通訊協定項目定義於 %s"
+msgid "no hdlist file found for medium \"%s\""
+msgstr "無媒體 \"%s\" 的 hdlist 檔案被找到"
 
-#: ../urpmq:1
+#: ../urpm.pm:1501 ../urpm.pm:1555
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - 顯示版本與發行名稱.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "檔案 [%s] 已經被相同的 \"%s\" 媒體所使用了"
 
-#: ../urpmf:1
+#: ../urpm.pm:1541
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - 顯示標籤過時: 全部過時.\n"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "無法從語法上分析 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1579
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "媒體 \"%s\" 已經存在"
+msgid "unable to write list file of \"%s\""
+msgstr "無法寫入 \"%s\" 的清單檔案"
 
-#: ../_irpm:1
+#: ../urpm.pm:1586
 #, c-format
-msgid "installing %s\n"
-msgstr "正在安裝 %s\n"
+msgid "writing list file for medium \"%s\""
+msgstr "正在寫入 \"%s\" 的清單檔案"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1588
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"要更新的項目遺失\n"
-"(%s 的其中一個)\n"
+msgid "nothing written in list file for \"%s\""
+msgstr "沒有資料寫入 \"%s\" 的清單檔案"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1603
 #, c-format
-msgid "trying to promote %s"
-msgstr "正在嘗試促進 %s"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "檢驗 \"%s\" 的 pubkey 檔案..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1610
 #, c-format
-msgid "unable to remove package %s"
-msgstr "無法移除套件 %s"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...由 \"%s\" 的 pubkey 檔案匯入 key %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1613
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "讀取 \"%s\" 媒體的綜合檔案發生問題"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "無法匯入 \"%s\" 的 pubkey 檔案"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1679
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"要移除的項目遺失\n"
-"(%s 的其中一個)\n"
+msgid "reading headers from medium \"%s\""
+msgstr "正在讀取媒體 \"%s\" 的標頭"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1684
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - 選擇全部的媒體.\n"
+msgid "building hdlist [%s]"
+msgstr "正在建立 hdlist [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1696 ../urpm.pm:1725 ../urpmi:355
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "遺失簽名 (%s)"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "為媒體 \"%s\" 建立綜合檔案"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1745
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "無法由 [%s] 讀取 rpm 套件: %s"
+msgid "found %d headers in cache"
+msgstr "在 cache 找到 %d 個標頭"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1749
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 穿過別名機器分散式的 urpmi\n"
+msgid "removing %d obsolete headers in cache"
+msgstr "正在移除 %d 個在 cache 內廢棄的標頭"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1893
 #, c-format
-msgid "copy of [%s] failed (file is suspiciously small)"
-msgstr "複製 [%s] 失敗 (檔案可疑的小)"
+msgid "mounting %s"
+msgstr "正在掛載 %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - 只更新更新的媒體.\n"
+msgid "unmounting %s"
+msgstr "正在卸載 %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:1928
 #, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) (是/否) "
+msgid "relocated %s entries in depslist"
+msgstr "重新安置 %s 項目於 depslist"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:1929
 #, c-format
-msgid "   -g [group]     - restrict results to given group.\n"
-msgstr "   -g [group]     - 限制結果到給定的群組.\n"
+msgid "no entries relocated in depslist"
+msgstr "無項目被重新安置於 depslist"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1942
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的清單, 忽略媒體"
+msgid "invalid rpm file name [%s]"
+msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1948
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "不合格式的輸入:[%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "正在擷取 rpms 檔案 [%s] ..."
 
-#: ../urpme:1
+#: ../urpm.pm:1955 ../urpm.pm:2821
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "移除套件 %s 將破壞您的系統"
+msgid "unable to access rpm file [%s]"
+msgstr "無法存取 rpm 檔案 [%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:1960
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   -- 列出可用的媒體.\n"
+msgid "unable to register rpm file"
+msgstr "無法註冊 rpm 檔案"
 
-#: ../urpmi:1
+#: ../urpm.pm:1963
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"某些要求的套件不能被安裝:\n"
-"%s"
+msgid "error registering local packages"
+msgstr "註冊本地端套件錯誤"
 
-#: ../urpmi:1
+#: ../urpm.pm:2076
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安裝套件 `%s' (%s/%s)..."
+msgid "no package named %s"
+msgstr "沒有套件命名為 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2079 ../urpme:88
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "無項目被重新安置於 depslist"
+msgid "The following packages contain %s: %s"
+msgstr "以下套件包含 %s: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2280 ../urpm.pm:2324 ../urpm.pm:2350
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "有多個套件有相同 rpm 檔案名稱 \"%s\""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2335
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - 使用 curl 擷取遠端檔案.\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "無法正確從語法上分析 [%s] 於數值 \"%s\""
 
-#: ../urpmf:1
+#: ../urpm.pm:2362
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接包含 perl 碼類似 perl -e.\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"媒體 \"%s\" 使用一個無效的清單檔案:\n"
+"  鏡設站可能不是最新狀態, 正在嘗試使用替代方法"
 
-#: ../urpmi:1
+#: ../urpm.pm:2366
 #, c-format
-msgid "do you agree ?"
-msgstr "你同意嗎?"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案位置"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2378
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "前後不一致的 \"%s\" 的清單檔案, 忽略這個媒體"
+msgid "package %s is not found."
+msgstr "找不到套件 %s."
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2418 ../urpm.pm:2433 ../urpm.pm:2457 ../urpm.pm:2472
 #, c-format
-msgid "...retrieving done"
-msgstr "...擷取完成"
+msgid "urpmi database locked"
+msgstr "urpmi 資料庫鎖住了"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2524 ../urpm.pm:2527 ../urpm.pm:2557
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "正在新增套件 %s (id=%d, eid=%d, update=%d, file=%s)"
+msgid "medium \"%s\" is not selected"
+msgstr "未選擇媒體 \"%s\" "
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2553
 #, c-format
-msgid "skipping package %s"
-msgstr "正在略過套件 %s"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "無法由媒體 \"%s\" 讀取 [%s] rpm 檔案"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2561
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "無效的簽名 (%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "前後不一致的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
 
-#: ../urpmq:1
+#: ../urpm.pm:2574
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  在命令列給予的名稱或 rpm 檔案會被查詢.\n"
+msgid "unable to access medium \"%s\""
+msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpmi:1
+#: ../urpm.pm:2635
 #, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi 版本 %s\n"
-"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
-"\n"
-"用法:\n"
+msgid "malformed input: [%s]"
+msgstr "不合格式的輸入:[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2642
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "無法正確從語法上分析 [%s] 於數值 \"%s\""
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:2719 ../urpmi:686
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用給定的媒體, 以逗號分開.\n"
+msgid "Preparing..."
+msgstr "準備中..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2752
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "無法決定這個 hdlist 檔案 [%s] 的媒體"
+msgid "using process %d for executing transaction"
+msgstr "正在使用 %d 程序以執行交易"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2783
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "無法從語法上分析 \"%s\" 的 hdlist 檔案"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "建立交易給 %s 上的安裝 (移除=%d, 安裝=%d, 升級=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2786
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist, 忽略媒體"
+msgid "unable to create transaction"
+msgstr "無法建立處理"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2794
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "由於與 %s 的衝突"
+msgid "removing package %s"
+msgstr "正在移除套件 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2796
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "正在移除 %d 個在 cache 內廢棄的標頭"
+msgid "unable to remove package %s"
+msgstr "無法移除套件 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:2806
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "無法更新媒體 \"%s\"\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "正在新增套件 %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:2809
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "嘗試不檢查相依性安裝? (y/N)(是/否)"
+msgid "unable to install package %s"
+msgstr "無法安裝套件 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3009 ../urpm.pm:3042
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "虛擬媒體 \"%s\" 並非本地端, 忽略這個媒體"
+msgid "due to missing %s"
+msgstr "由於 %s 遺失"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3010 ../urpm.pm:3040
 #, c-format
-msgid "Preparing..."
-msgstr "準備中..."
+msgid "due to unsatisfied %s"
+msgstr "由於 %s 未被滿足"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3011
 #, c-format
-msgid "                    defaults is %s.\n"
-msgstr "                    預設為 %s.\n"
+msgid "trying to promote %s"
+msgstr "正在嘗試促進 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3012
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "使用不同的可移動式裝置 [%s] 於 \"%s\" "
+msgid "in order to keep %s"
+msgstr "為了要保留 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3035
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 不嘗試尋找綜合檔案或 hdlist 檔案.\n"
+msgid "in order to install %s"
+msgstr "為了要安裝 %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3047
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - 不於 provides 中搜尋以找到套件.\n"
+msgid "due to conflicts with %s"
+msgstr "由於與 %s 的衝突"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "copy of [%s] failed (md5sum mismatch)"
-msgstr "複製 [%s] 失敗 (md5sum 不合)"
+msgid "unrequested"
+msgstr "未被要求"
 
-#: ../urpmq:1
+#: ../urpm.pm:3065
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
-"                   This permit to querying a distro.\n"
-msgstr ""
+msgid "Invalid signature (%s)"
+msgstr "無效的簽名 (%s)"
 
-#: ../rpm-find-leaves:1
+#: ../urpm.pm:3092
 #, c-format
-msgid ""
-"usage: %s [options]\n"
-"where [options] are from\n"
-msgstr ""
-"使用法: %s [選項]\n"
-"其中 [選項] 是從\n"
+msgid "Invalid Key ID (%s)"
+msgstr "無效的 Key ID (%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3094
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - 在任何其他事前先由 cache 中移除 rpm.\n"
+msgid "Missing signature (%s)"
+msgstr "遺失簽名 (%s)"
 
-#: ../urpm.pm:1
+#: ../urpm/args.pm:86 ../urpm/args.pm:92
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "無法使用名稱 \"%s\" 給未命名的媒體因為它已經被使用了"
+msgid "bad proxy declaration on command line\n"
+msgstr "於命令列上有壞的 proxy 宣告\n"
 
-#: ../urpmf:1
+#: ../urpm/args.pm:220
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - 顯示標籤衝突: 衝突.\n"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpm/msg.pm:80
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "虛擬媒體 \"%s\" 應該有有效的來源 hdlist 或綜合, 忽略這個媒體"
+msgid "Sorry, bad choice, try again\n"
+msgstr "對不起, 錯誤選擇, 再試一次\n"
 
-#: ../urpme:1
+#: ../urpme:36
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -892,1046 +817,1166 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:47
+#: ../urpmi.removemedia:36 ../urpmi.update:30 ../urpmq:43
+#, c-format
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 顯示此說明訊息.\n"
+
+#: ../urpme:42 ../urpmi:83
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自動選擇一個上等套件.\n"
+
+#: ../urpme:43 ../urpmi:124
 #, c-format
 msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"\n"
-"and [options] are from\n"
-msgstr ""
-"用法: urpmi.addmedia [選項] <名稱> <url> [with <相對路徑>]\n"
-"其中 <url> 是以下其中一項\n"
-"         file://<路徑>\n"
-"         ftp://<登入名稱>:<密碼>@<主機名稱>/<路徑> with <hdlist 的相對檔案名"
-"稱>\n"
-"         ftp://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
-"         http://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
-"         removable://<路徑>\n"
-"\n"
-"而 [選項] 來自\n"
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - 確認安裝是否能夠正確達成.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:97 ../urpmq:63
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在複製 \"%s\" 的來源 hdlist (或綜合)..."
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 強制實施即使某些套件不存在.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:102 ../urpmq:64
 #, c-format
-msgid "...copying done"
-msgstr "...複製完成"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 穿過別名機器分散式的 urpmi\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:103
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "無法使用平行選項 \"%s\""
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --root         - 使用另一個 rpm 安裝的根.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
-"媒體 \"%s\" 使用一個無效的清單檔案:\n"
-"  鏡設站可能不是最新狀態, 正在嘗試使用替代方法"
+"  --use-distrib  - 由一個發行版樹即時設定 urpmi ,有用於\n"
+"                   安裝/反安裝一個 chroot 藉由 --root 選項.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49 ../urpmi:133 ../urpmq:76
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "無法存取第一個安裝媒體"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             - 完整資訊模式.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:50
 #, c-format
-msgid "virtual medium need to be local"
-msgstr "虛擬媒體需要是本地的"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 選擇所有符合描述的套件.\n"
 
-#: ../urpm.pm:1
+#: ../urpme:83
 #, c-format
-msgid "error registering local packages"
-msgstr "註冊本地端套件錯誤"
+msgid "unknown packages"
+msgstr "未知的套件"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:83
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr ""
+msgid "unknown package"
+msgstr "未知的套件"
 
-#: ../urpm.pm:1
+#: ../urpme:93
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "發現探查到的 hdlist (或綜合) 為 %s"
+msgid "removing package %s will break your system"
+msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpm.pm:1
+#: ../urpme:95
 #, c-format
-msgid "retrieval of source hdlist (or synthesis) failed"
-msgstr "擷取來源 hdlist (或綜合) 失敗"
+msgid "Nothing to remove"
+msgstr "沒有東西可移除"
 
-#: ../urpm.pm:1
+#: ../urpme:99
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "在 [%s] 內找不到 rpm 檔案"
+msgid "Checking to remove the following packages"
+msgstr "正在檢查以移除以下套件:"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "沒有資料寫入 \"%s\" 的清單檔案"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "為了滿足相依性, 下列套件將會被移除 (%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:108 ../urpmi:471 ../urpmi:632
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列套件有壞的簽名"
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
 
-#: ../urpm.pm:1
+#: ../urpme:111 ../urpmi:675
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "計算來源 hdlist 的 md5sum (或綜合)"
+msgid "removing %s"
+msgstr "正在移除 %s"
 
-#: ../urpmq:1
+#: ../urpme:115
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - 完整輸出要移除的套件.\n"
+msgid "Removing failed"
+msgstr "正在移除失敗"
 
-#: ../urpm.pm:1
+#: ../urpmf:27
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
+"\n"
+"用法:\n"
+
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
-msgid "unable to install package %s"
-msgstr "無法安裝套件 %s"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用更新的媒體.\n"
+
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
+#, c-format
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 只使用給定的媒體, 以逗號分開.\n"
+
+#: ../urpmf:35 ../urpmi:80 ../urpmq:46
+#, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用給定的媒體, 以逗號分開.\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - 允許要求使用者安裝套件\n"
-"                   而不檢查相依性與完整性.\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 依據子字串排序媒體, 以逗號分開.\n"
 
-#: ../urpmi:1
+#: ../urpmf:37 ../urpmq:48
 #, c-format
-msgid "Save file"
-msgstr "儲存檔案"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用給定的綜合檔案, 而不是 urpmi db.\n"
 
-#: ../urpm/args.pm:1
+#: ../urpmf:38
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 無法讀取 rpm 檔案 \"%s\"\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 完整資訊模式.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:39
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "無法寫入設定檔 [%s]"
+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"
 
-#: ../urpme:1
+#: ../urpmf:41
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 選擇所有符合描述的套件.\n"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - 不顯示同一的行.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:42
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "無效的 Key ID (%s)"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all          - 列印全部標籤.\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:43
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 強制實施即使某些套件不存在.\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group        - 顯示標籤群組: 群組.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:44
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "無法擷取移動式媒體 \"%s\" 的路徑名稱"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - 顯示標籤大小: 大小.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:45
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - 嘗試尋找並使用綜合檔案.\n"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - 顯示標籤時代: 時代.\n"
 
-#: ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用給定的綜合而不是 urpmi db.\n"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - 列印標籤摘要: 摘要.\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:47
 #, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr ""
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   - 顯示標籤描述: 描述.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid "<relative path of hdlist> missing\n"
-msgstr "<hdlist 的相對路徑> 遺失\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - 顯示標籤 sourcerpm: source rpm.\n"
 
-#: ../urpme:1
+#: ../urpmf:49
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "正在檢查以移除以下套件:"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - 顯示標籤包裝者: 裝者.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unrequested"
-msgstr "未被要求"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - 顯示標籤 buildhost: build host.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:51
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "無法存取 rpm 檔案 [%s]"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - 顯示標籤 url: url.\n"
 
-#: ../urpmf:1
+#: ../urpmf:52
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - 顯示標籤檔案: 全部檔案.\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides     - 顯示標籤提供: 全部提供.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:53
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "無法解析 %s 檔案內的 %s"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires     - 顯示標籤需要: 全部需要.\n"
 
-#: ../urpmi:1
+#: ../urpmf:54
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您要繼續進行安裝嗎?"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files        - 顯示標籤檔案: 全部檔案.\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:55
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "無法由媒體 \"%s\" 讀取 [%s] rpm 檔案"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - 顯示標籤衝突: 衝突.\n"
 
-#: ../urpmi:1
+#: ../urpmf:56
+#, c-format
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - 顯示標籤過時: 全部過時.\n"
+
+#: ../urpmf:57 ../urpmi:117 ../urpmq:73
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to install a chroot with --root option.\n"
-msgstr ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報).\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:59
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "為媒體 \"%s\" 建立綜合檔案"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - 於每一個樣式中忽略大小寫分別.\n"
 
-#: ../urpmq:1
+#: ../urpmf:60 ../urpmq:88
 #, c-format
-msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - 以人類可讀形式顯示有用資訊.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 顯示版本, 發行與 arch 名稱.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:61
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接包含 perl 碼類似 perl -e.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - 使用指定的 url 給鏡射站台清單, 預設為\n"
-"                   %s\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -a             - 二元 AND 運算子, 真值若兩者皆真.\n"
 
-#: ../urpme:1
+#: ../urpmf:63
 #, c-format
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 由一個發行版樹即時設定 urpmi ,有用於\n"
-"                   安裝/反安裝一個 chroot 藉由 --root 選項.\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
+msgstr "  -o             - 二元 OR 運算子, 真值若一者為真.\n"
 
-#: ../urpmf:1
+#: ../urpmf:64
 #, c-format
 msgid "  !              - unary NOT, true if expression is false.\n"
 msgstr "  !             - 一元 NOT, 真值若描述句為假.\n"
 
-#: ../urpmi:1
+#: ../urpmf:65
+#, c-format
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - 左括弧以開啟群組描述句.\n"
+
+#: ../urpmf:66
+#, c-format
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - 右括弧以關閉群組描述句.\n"
+
+#: ../urpmf:114
 #, c-format
 msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr "目錄 [%s] 已經存在, 請使用另一個目錄給臭蟲報告或刪除它"
+"callback is :\n"
+"%s\n"
+msgstr ""
+"收回回饋是 :\n"
+"%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:119 ../urpmi:249 ../urpmq:111
 #, c-format
-msgid "unmounting %s"
-msgstr "正在卸載 %s"
+msgid "using specific environment on %s\n"
+msgstr "正在使用特定的環境於 %s\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:150
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "沒有東西可以更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:72
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        %s%% 完成, 速度 = %s"
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 版本 %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
+"\n"
+"用法:\n"
 
-#: ../urpmi:1
+#: ../urpmi:82
 #, c-format
-msgid "restarting urpmi"
-msgstr "正在重新開始 urpmi"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用給定的綜合而不是 urpmi db.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:84 ../urpmq:49
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "檢驗綜合檔案 [%s]"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自動選擇升級系統的套件.\n"
 
-#: ../urpmi:1
+#: ../urpmi:85
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "嘗試甚至更強制的安裝方式 (--force)? (y/N)(是/否)"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - 永不要求反安裝一個套件, 中斷安裝.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:86 ../urpmq:51
 #, c-format
-msgid "...copying failed"
-msgstr "...複製失敗"
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - 盡可能保留存在的套件, 拒絕                  會導致移除的被"
+"要求的套件.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:88
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "無法存取 \"%s\" hdlist 檔案, 忽略這個媒體"
+msgid ""
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi:91
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - 安靜模式.\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:92 ../urpmq:50
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 完整資訊模式.\n"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - 加上模糊搜尋(如同 -y).\n"
 
-#: ../urpmq:1
+#: ../urpmi:93 ../urpmq:59
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下載前先給予所有原始碼套件(只有 root).\n"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - 下個套件是原始碼套件 (如同 -s).\n"
 
-#: ../urpmq:1
+#: ../urpmi:94
 #, c-format
-msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
-"  --headers      - 從 urpmi db 中萃取套件標頭到\n"
-"                 stdout (只有 root).\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "unknown packages"
-msgstr "未知的套件"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "  --clean        - 在任何其他事前先由 cache 中移除 rpm.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "正在選擇多個媒體: \"%s\""
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - 保留 cache 中未使用的 rpm.\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:98
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 顯示版本, 發行與 arch 名稱.\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - 允許要求使用者不檢查相依性\n"
+"                   安裝套件.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:100
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "檔案 [%s] 已經被相同的 \"%s\" 媒體所使用了"
+msgid ""
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - 允許要求使用者安裝套件\n"
+"                   而不檢查相依性與完整性.\n"
 
-#: ../urpmi.removemedia:1
+#: ../urpmi:104
 #, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "沒有東西可以移除 (使用 urpmi.addmedia 以新增一個媒體)\n"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:67
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "無法找到 \"%s\" 清單檔案, 忽略這個媒體"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - 使用 wget 擷取遠端檔案.\n"
 
-#: ../rpm-find-leaves:1
+#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:68
 #, c-format
-msgid "   -h|--help      - print this help message.\n"
-msgstr "   -h|--help      - 顯示此說明訊息.\n"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - 使用 curl 擷取遠端檔案.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "在 %s 發現節點的處理器"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr ""
 
-#: ../urpmf:1
+#: ../urpmi:109
 #, c-format
 msgid ""
-"callback is :\n"
-"%s\n"
+"  --resume       - resume transfer of partially-downloaded files\n"
+"                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
-"收回回饋是 :\n"
-"%s\n"
+"  --resume       - 重新開始部份下載檔案的傳送\n"
+"                   (--no-resume 禁用它, 預設為禁用).\n"
 
-#: ../urpmq:1
+#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:69
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - 逆向搜尋何者需要套件.\n"
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - 使用指定的 HTTP proxy, port number 被假設\n"
+"                   為1080 為預設值 (格式為 <proxyhost[:port]>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:71
 #, 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"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
 msgstr ""
-"urpmf 版本 %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
-"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
-"\n"
-"用法:\n"
+"  --proxy-user   - 指定 proxy 認證的使用者與密碼\n"
+"                   (格式為 <user:password>).\n"
 
-#: ../urpmf:1
+#: ../urpmi:115
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
 msgstr ""
-"  --quiet        - 不顯示標籤名稱 (預設若無標籤給定於 命\n"
-"                   令列, 不相容於互動式模式).\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - 不顯示同一的行.\n"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - 使用 X 界面.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:120
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
 msgstr ""
-"--synthesis 不能夠與 --media, --excludemedia, --sortmedia, --update 與 --"
-"parallel 使用"
+"  --best-output  - 按照環境選擇最佳的界面:\n"
+"                   X 或文字模式.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:122
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
+"  --verify-rpm   - 安裝前檢驗 rpm 簽名.\n"
+"                   (--no-verify-rpm 禁用它, 預設為啟用).\n"
 
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
+#: ../urpmi:125
 #, c-format
-msgid "Is this OK?"
-msgstr "這樣可以嗎?"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - 排除以逗號分開的路徑.\n"
 
-#: ../urpmi:1
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude docs files.\n"
 msgstr ""
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:127 ../urpmq:79
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用給定的綜合檔案, 而不是 urpmi db.\n"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - 選擇命令列中所有符合項目.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:128
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "檢驗 [%s] 檔案內的平行處理器"
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - 允許於 provides 中搜尋以找到套件.\n"
 
-#: ../urpme:1
+#: ../urpmi:129 ../urpmq:81
 #, c-format
-msgid "Nothing to remove"
-msgstr "沒有東西可移除"
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - 不於 provides 中搜尋以找到套件.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:130 ../urpmq:83
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...由 \"%s\" 的 pubkey 檔案匯入 key %s"
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - 加上模糊搜尋( 如同 --fuzzy).\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:131 ../urpmq:84
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "正在讀取媒體 \"%s\" 的標頭"
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - 下個套件是原始檔套件 (如同 --src).\n"
 
-#: ../urpmq:1
+#: ../urpmi:132
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - 延伸套件相依性的查詢.\n"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 安靜模式.\n"
 
-#: ../urpmi:1
+#: ../urpmi:134
 #, c-format
-msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
-msgstr ""
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  於命令列指定的名稱或 rpm 檔案將會被安裝.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:141
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案位置"
+msgid "Choose location to save file"
+msgstr "選擇存檔的位置"
 
-#: ../urpmf:1
+#: ../urpmi:197
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - 顯示標籤 sourcerpm: source rpm.\n"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "當使用 --install-src 時隨著二元 rpm 檔案可做的事"
 
-#: ../urpm.pm:1
+#: ../urpmi:204
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "無法寫入 \"%s\" 的清單檔案"
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it\n"
+"would allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+"你已經選擇一個來源套件:\n"
+"\n"
+"%s\n"
+"\n"
+"您大概不想安裝它於您的電腦上 (安裝它會允許您對它的原始碼做出更改\n"
+"然後編譯它).\n"
+"\n"
+"您想怎麼做?"
 
-#: ../urpmf:1
+#: ../urpmi:212
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - 顯示標籤需要: 全部需要.\n"
+msgid "Do nothing"
+msgstr "不進行任何動作"
 
-#: ../urpm.pm:1
+#: ../urpmi:213
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "正在嘗試選擇不存在的媒體 \"%s\""
+msgid "Yes, really install it"
+msgstr "是的, 實在安裝它"
 
-#: ../urpmf:1
+#: ../urpmi:214 ../urpmi:231
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   - 顯示標籤描述: 描述.\n"
+msgid "Save file"
+msgstr "儲存檔案"
 
-#: ../urpmi:1
+#: ../urpmi:225
 #, c-format
-msgid "Copying failed"
-msgstr "複製失敗"
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+"您正要安裝下列軟體套件於您的電腦上:\n"
+"\n"
+"%s\n"
+"\n"
+"您或許寧願只是儲存它. 您的選擇是什麼?"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:230
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 強制 hdlist 檔案產生.\n"
+msgid "Install it"
+msgstr "安裝它"
 
-#: ../urpmq:1
+#: ../urpmi:239
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes 只能夠與 --parallel 一同使用"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr "目錄 [%s] 已經存在, 請使用另一個目錄給臭蟲報告或刪除它"
 
-#: ../urpm.pm:1
+#: ../urpmi:240
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "無媒體 \"%s\" 的 hdlist 檔案被找到"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "無法建立 [%s] 目錄給臭蟲回報"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:243 ../urpmi:365
 #, c-format
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - 下個套件是原始檔套件 (如同 --src).\n"
+msgid "Copying failed"
+msgstr "複製失敗"
 
-#: ../urpmi:1
+#: ../urpmi:260
 #, c-format
-msgid "installing %s"
-msgstr "正在安裝 %s"
+msgid "Only superuser is allowed to install packages"
+msgstr "只有 superuser 才允許安裝套件"
 
-#: ../urpm.pm:1
+#: ../urpmi:396
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "由 [%s] 讀取 rpm 檔案"
+msgid "One of the following packages is needed:"
+msgstr "需要下列其中一個套件:"
 
-#: ../urpm.pm:1
+#: ../urpmi:403
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "複製 \"%s\" 的敘述檔案..."
+msgid "What is your choice? (1-%d) "
+msgstr "何者是您的選擇? (1-%d) "
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自動選擇一個上等套件.\n"
+msgid "Package installation..."
+msgstr "套件安裝..."
 
-#: ../urpme:1
+#: ../urpmi:412 ../urpmi:530
 #, c-format
-msgid "Removing failed"
-msgstr "正在移除失敗"
+msgid "Initializing..."
+msgstr "初始化中..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:435
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
+"Some package requested cannot be installed:\n"
+"%s"
 msgstr ""
+"某些要求的套件不能被安裝:\n"
+"%s"
 
-#: ../urpm.pm:1
+#: ../urpmi:440 ../urpmi:466
 #, c-format
-msgid "package %s is not found."
-msgstr "找不到套件 %s."
+msgid "do you agree ?"
+msgstr "你同意嗎?"
 
-#: ../urpm.pm:1
+#: ../urpmi:455
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "移除媒體 \"%s\""
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"安裝無法繼續因為下列套件必須移除給其他套件來升級:\n"
+"%s\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:461
 #, c-format
-msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"下列套件必須移除給其他套件來升級:\n"
+"%s"
 
-#: ../_irpm:1 ../urpm/msg.pm:1
+#: ../urpmi:499 ../urpmi:508
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
+msgstr "為了滿足相依性, 下列套件將要被安裝. (%d MB)"
+
+#: ../urpmi:505
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid ""
+"You need to be root to install the following dependencies:\n"
+"%s\n"
+msgstr ""
+"您需要為 root 以安裝下列相依性項目:\n"
+"%s\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:526 ../urpmq:296
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - 下個套件是原始碼套件 (如同 -s).\n"
+msgid "unable to get source packages, aborting"
+msgstr "無法取得原始碼套件, 放棄"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:540
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報).\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:541
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 依據子字串排序媒體, 以逗號分開.\n"
+msgid "Press Enter when ready..."
+msgstr "準備好時請按 Enter..."
 
-#: ../urpm.pm:1
+#: ../urpmi:585
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "無法存取媒體 \"%s\" "
+msgid "Downloading package `%s'..."
+msgstr "正在下載套件 `%s'..."
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:597
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "無法建立媒體 \"%s\"\n"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
 
-#: ../urpmf:1
+#: ../urpmi:600
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - 顯示標籤包裝者: 裝者.\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% 完成, 速度 = %s"
 
-#: ../urpmq:1
+#: ../urpmi:619
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
+msgid "The following packages have bad signatures"
+msgstr "下列套件有壞的簽名"
+
+#: ../urpmi:620
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "您要繼續進行安裝嗎?"
 
-#: ../urpmi:1
+#: ../urpmi:640 ../urpmi:767
 #, c-format
 msgid ""
-"You need to be root to install the following dependencies:\n"
+"Installation failed, some files are missing:\n"
 "%s\n"
+"You may want to update your urpmi database"
 msgstr ""
-"您需要為 root 以安裝下列相依性項目:\n"
+"安裝失敗, 某些檔案遺失:\n"
 "%s\n"
+"您或許要更新您的 urpmi 資料庫"
 
-#: ../urpmq:1
+#: ../urpmi:650 ../urpmi:705 ../urpmi:726 ../urpmi:746
 #, c-format
-msgid "  --changelog    - print changelog.\n"
-msgstr "  --changelog    - 顯示 changelog.\n"
+msgid "Installation failed"
+msgstr "安裝失敗"
 
-#: ../urpm.pm:1
+#: ../urpmi:665
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "無法存取 \"%s\" 的清單檔, 忽略這個媒體"
+msgid "distributing %s"
+msgstr "正在發佈 %s"
 
-#: ../urpmf:1
+#: ../urpmi:673
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - 右括弧以關閉群組描述句.\n"
+msgid "installing %s"
+msgstr "正在安裝 %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:688
 #, c-format
-msgid "no webfetch found, supported webfetch are: %s\n"
-msgstr "沒有找到 webfetch, 支援的 webfetch 有: %s\n"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../urpm.pm:1
+#: ../urpmi:712
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "檢驗 hdlist 檔案 [%s]"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "嘗試不檢查相依性安裝? (y/N)(是/否)"
 
-#: ../urpm.pm:1
+#: ../urpmi:731
 #, c-format
-msgid "copying hdlists file..."
-msgstr "複製 hdlist 檔案..."
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "嘗試甚至更強制的安裝方式 (--force)? (y/N)(是/否)"
 
-#: ../urpm.pm:1
+#: ../urpmi:772
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "正在寫入 \"%s\" 的清單檔案"
+msgid "%d installation transactions failed"
+msgstr "%d 安裝處理失敗"
 
-#: ../urpm.pm:1
+#: ../urpmi:780
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url, 忽略這個媒體"
+msgid "Installation is possible"
+msgstr "安裝為可能的"
 
-#: ../urpmf:1
+#: ../urpmi:783
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - 顯示標籤 buildhost: build host.\n"
+msgid "Everything already installed"
+msgstr "每一個東西都已經安裝了"
 
-#: ../urpmi:1
+#: ../urpmi:797
 #, c-format
-msgid "Do nothing"
-msgstr "不進行任何動作"
+msgid "restarting urpmi"
+msgstr "正在重新開始 urpmi"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:38
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"用法: urpmi.addmedia [選項] <名稱> <url> [with <相對路徑>]\n"
+"其中 <url> 是以下其中一項\n"
+"         file://<路徑>\n"
+"         ftp://<登入名稱>:<密碼>@<主機名稱>/<路徑> with <hdlist 的相對檔案名"
+"稱>\n"
+"         ftp://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
+"         http://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
+"         removable://<路徑>\n"
+"\n"
+"而 [選項] 來自\n"
+
+#: ../urpmi.addmedia:55
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "使用相關媒體於平行模式: %s"
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - 建立更新的媒體.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:56
 #, c-format
-msgid "mounting %s"
-msgstr "正在掛載 %s"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - 嘗試尋找並使用綜合檔案.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:57
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "無法處理媒體 \"%s\" 因為另一個媒體正在使用清單檔"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - 嘗試尋找並使用 hdlist 檔案.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:58
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "無法取得原始碼套件, 放棄"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - 不嘗試尋找綜合檔案或 hdlist 檔案.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.addmedia:60
 #, c-format
-msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - 使用另一個 rpm 安裝的根.\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - 自動從安裝媒體建立全部媒體.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        %s%% of %s 完成, ETA = %s, 速度 = %s"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:65
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "正在計算來源 hdlist (或綜合) 的 md5sum"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr ""
+"  --from         - 使用指定的 url 給鏡射站台清單, 預設為\n"
+"                   %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:67
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "無法匯入 \"%s\" 的 pubkey 檔案"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:70
 #, c-format
 msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - 永不要求反安裝一個套件, 中斷安裝.\n"
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:72
 #, c-format
 msgid ""
-"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"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
 msgstr ""
-"urpmq 版本 %s\n"
-"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
-"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
-"\n"
-"用法:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:74 ../urpmi.update:39
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在擷取 \"%s\" 的來源 hdlist (或綜合)..."
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr ""
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:75 ../urpmi.removemedia:38 ../urpmi.update:42
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - 顯示群組及名稱.\n"
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 清除標頭 cache 目錄.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76 ../urpmi.update:43
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "未選擇媒體 \"%s\" "
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 強制 hdlist 檔案產生.\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:130
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "只有 superuser 才允許安裝套件"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "無法新增 cooker 發行版的更新\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:135
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "正在使用特定的環境於 %s\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "正在擷取鏡射站台於 %s ..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:172
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "無法找到 \"%s\" hdlist 檔案, 忽略這個媒體"
+msgid "no need to give <relative path of hdlist> with --distrib"
+msgstr "用 --distrib 時不需要給予 <hdlist 的相對路徑>"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:179 ../urpmi.addmedia:202
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr ""
+msgid "unable to update medium \"%s\"\n"
+msgstr "無法更新媒體 \"%s\"\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:190
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - 左括弧以開啟群組描述句.\n"
+msgid "<relative path of hdlist> missing\n"
+msgstr "<hdlist 的相對路徑> 遺失\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:192
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移動式媒體 \"%s\" 的掛載點過多"
+msgid "`with' missing for network media\n"
+msgstr "用網路媒體時遺漏了 `with'\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:200
 #, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - 二元 AND 運算子, 真值若兩者皆真.\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "無法建立媒體 \"%s\"\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
 msgstr ""
-"無法存取媒體 \"%s\",\n"
-"這在你建立媒體時手動掛載目錄時有可能發生."
-
-#: ../urpmf:1
-#, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - 顯示標籤群組: 群組.\n"
+"用法: urpmi.removemedia [-a] <名稱> ...\n"
+"其中 <名稱> 是要移除的媒體名稱.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用給定的媒體, 以逗號分開.\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - 選擇全部的媒體.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:39
 #, c-format
-msgid "unable to create transaction"
-msgstr "無法建立處理"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知選項 '%s'\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "沒有東西可以移除 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"You have selected a source package:\n"
-"\n"
-"%s\n"
-"\n"
-"You probably didn't want to install it on your computer (installing it\n"
-"would allow you to make modifications to its sourcecode then compile it).\n"
-"\n"
-"What would you like to do?"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"你已經選擇一個來源套件:\n"
-"\n"
-"%s\n"
-"\n"
-"您大概不想安裝它於您的電腦上 (安裝它會允許您對它的原始碼做出更改\n"
-"然後編譯它).\n"
-"\n"
-"您想怎麼做?"
+"要移除的項目遺失\n"
+"(%s 的其中一個)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:28
 #, c-format
-msgid "distributing %s"
-msgstr "正在發佈 %s"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"用法:urpmi.update [選項] <名稱> ...\n"
+"其中 <名稱> 為要更新的媒體名稱.\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:38
 #, c-format
-msgid "Installation failed"
-msgstr "安裝失敗"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - 只更新更新的媒體.\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:40
 #, c-format
-msgid "write config file [%s]"
-msgstr "寫入設定檔 [%s]"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr ""
 
-#: ../urpmi.update:1
+#: ../urpmi.update:41
 #, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有非移動式媒體.\n"
 
-#: ../urpmf:1
+#: ../urpmi.update:63
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - 顯示標籤時代: 時代.\n"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "沒有東西可以更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi:1
+#: ../urpmi.update:75
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - 安裝前檢驗 rpm 簽名.\n"
-"                   (--no-verify-rpm 禁用它, 預設為啟用).\n"
+"要更新的項目遺失\n"
+"(%s 的其中一個)\n"
+
+#: ../urpmq:38
+#, fuzzy, c-format
+msgid ""
+"urpmq version %s\n"
+"Copyright (C) 2000-2004 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
+"\n"
+"用法:\n"
 
-#: ../urpmi:1
+#: ../urpmq:53
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "請將具有名稱 \"%s\" 的媒體放入到裝置 [%s] 內"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 列出可用的的套件.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:54
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 建立更新的媒體.\n"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   -- 列出可用的媒體.\n"
 
-#: ../urpmq:1
+#: ../urpmq:55
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url   -- 列出可用的媒體與其 url.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:56
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - 加上模糊搜尋( 如同 --fuzzy).\n"
-
-#: ../_irpm:1 ../urpm/msg.pm:1
-#, c-format
-msgid "Ok"
-msgstr "確定"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmq:57
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists 檔案中有無效的 hdlist 敘述 \"%s\""
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - 當使用 --parallel 時列出可用的節點.\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:58
 #, c-format
-msgid "removing %s"
-msgstr "正在移除 %s"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - 列出可用的平行別名.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:60
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
 msgstr ""
+"  --headers      - 從 urpmi db 中萃取套件標頭到\n"
+"                 stdout (只有 root).\n"
 
-#: ../urpmf:1
-#, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - 顯示標籤大小: 大小.\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "in order to keep %s"
-msgstr "為了要保留 %s"
-
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "由於 %s 未被滿足"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - 下載前先給予所有原始碼套件(只有 root).\n"
 
-#: ../_irpm:1
+#: ../urpmq:65
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
 msgstr ""
-"自動套件安裝...\n"
-"您要求安裝的套件 %s\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:75
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi 資料庫鎖住了"
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --changelog    - 顯示 changelog.\n"
 
-#: ../urpmi:1
+#: ../urpmq:77
 #, c-format
-msgid ""
-"  --resume       - resume transfer of partially-downloaded files\n"
-"                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - 重新開始部份下載檔案的傳送\n"
-"                   (--no-resume 禁用它, 預設為禁用).\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - 延伸套件相依性的查詢.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:78
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "檢驗 \"%s\" 的 pubkey 檔案..."
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - 若已經安裝較現今的版本則移除套件.\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:80
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr ""
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - 完整輸出要移除的套件.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:82
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "將可移動式裝置當成 \"%s\""
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - 逆向搜尋何者需要套件.\n"
 
-#: ../urpmi:1
+#: ../urpmq:85
 #, c-format
-msgid ""
-"You are about to install the following software package on your computer:\n"
-"\n"
-"%s\n"
-"\n"
-"You may prefer to just save it. What is your choice?"
-msgstr ""
-"您正要安裝下列軟體套件於您的電腦上:\n"
-"\n"
-"%s\n"
-"\n"
-"您或許寧願只是儲存它. 您的選擇是什麼?"
+msgid "  -i             - print useful information in human readable form.\n"
+msgstr "  -i             - 以人類可讀形式顯示有用資訊.\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:86
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - 加上模糊搜尋(如同 -y).\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - 顯示群組及名稱.\n"
 
-#: ../urpmq:1
+#: ../urpmq:87
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - 若已經安裝較現今的版本則移除套件.\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - 顯示版本與發行名稱.\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:89
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - 嘗試尋找並使用 hdlist 檔案.\n"
+msgid "  -l             - list files in package.\n"
+msgstr "  -l             - 顯示套件檔案.\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:90
 #, c-format
-msgid "due to missing %s"
-msgstr "由於 %s 遺失"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  在命令列給予的名稱或 rpm 檔案會被查詢.\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:150
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用更新的媒體.\n"
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes 只能夠與 --parallel 一同使用"
 
-#: ../urpmi.update:1
+#: ../urpmq:327
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
+msgid "skipping media %s: no hdlist\n"
 msgstr ""
-"用法:urpmi.update [選項] <名稱> ...\n"
-"其中 <名稱> 為要更新的媒體名稱.\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "正在嘗試避開現存的媒體  \"%s\" , 正在避免"
+#: ../urpmq:388
+#, fuzzy, c-format
+msgid "No filelist found\n"
+msgstr "找不到全部的媒介清單"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:398
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - 確認安裝是否能夠正確達成.\n"
+msgid "No changelog found\n"
+msgstr ""
+
+#~ msgid "One of the following packages is needed to install %s:"
+#~ msgstr "須要安裝下列其中之一套件 %s:"
+
+#~ msgid ""
+#~ "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"
+#~ msgstr ""
+#~ "urpmq 版本 %s\n"
+#~ "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+#~ "這是自由軟體且可以遵照 GNU GPL 的條款發佈.\n"
+#~ "\n"
+#~ "用法:\n"
 
 #~ msgid "Unknown webfetch `%s' !!!\n"
 #~ msgstr "未知的 webfetch `%s'!!!\n"
@@ -2085,9 +2130,6 @@ msgstr "  --test         - 確認安裝是否能夠正確達成.\n"
 #~ msgid "try urpmf --help for more options"
 #~ msgstr "鍵入 urpmf --help 顯示更多選項資料"
 
-#~ msgid "no full media list was found"
-#~ msgstr "找不到全部的媒介清單"
-
 #~ msgid "copying source list of \"%s\"..."
 #~ msgstr "複製“%s”的來源清單..."